parent: 5324a8 | patch | commitdiff
xiaoyong931011
2022-05-19 e64ac50998ba5fe69bac4baa667d0f5a216bc670
refs
author xiaoyong931011 <15274802129@163.com>
Thursday, May 19, 2022 18:17 +0800
committer xiaoyong931011 <15274802129@163.com>
Thursday, May 19, 2022 18:17 +0800
commite64ac50998ba5fe69bac4baa667d0f5a216bc670
tree de47e212954ccb7799d4bd79cf2c349b4393fbc2 tree | zip | gz
parent 5324a804f6dcb622f4ab3f554608e58c728e287e view | diff
f681a6a7852eb7c868ea539155861729c3e99da1 view | diff 
Merge branch 'mall-amz' of http://120.27.238.55:7000/r/xc-mall into mall-amz

 Conflicts:
	src/main/java/cc/mrbird/febs/common/enumerates/DataDictionaryEnum.java
6 files added
19 files modified
635 ■■■■■ changed files
src/main/java/cc/mrbird/febs/common/enumerates/DataDictionaryEnum.java 5 ●●●●● diff | view | raw | blame | history
src/main/java/cc/mrbird/febs/common/enumerates/MoneyFlowTypeEnum.java 7 ●●●●● diff | view | raw | blame | history
src/main/java/cc/mrbird/febs/mall/controller/AdminCommonController.java 29 ●●●●● diff | view | raw | blame | history
src/main/java/cc/mrbird/febs/mall/controller/AdminSystemController.java 31 ●●●●● diff | view | raw | blame | history
src/main/java/cc/mrbird/febs/mall/controller/ViewSystemController.java 20 ●●●●● diff | view | raw | blame | history
src/main/java/cc/mrbird/febs/mall/entity/MallOrderItem.java 4 ●●●●● diff | view | raw | blame | history
src/main/java/cc/mrbird/febs/mall/mapper/DataDictionaryCustomMapper.java 3 ●●●●● diff | view | raw | blame | history
src/main/java/cc/mrbird/febs/mall/mapper/MallMemberMapper.java 5 ●●●●● diff | view | raw | blame | history
src/main/java/cc/mrbird/febs/mall/mapper/MallMoneyFlowMapper.java 2 ●●●●● diff | view | raw | blame | history
src/main/java/cc/mrbird/febs/mall/mapper/MallOrderInfoMapper.java 2 ●●●●● diff | view | raw | blame | history
src/main/java/cc/mrbird/febs/mall/service/IApiMallMemberWalletService.java 2 ●●●●● diff | view | raw | blame | history
src/main/java/cc/mrbird/febs/mall/service/IMallMoneyFlowService.java 2 ●●●●● diff | view | raw | blame | history
src/main/java/cc/mrbird/febs/mall/service/IMemberProfitService.java 9 ●●●●● diff | view | raw | blame | history
src/main/java/cc/mrbird/febs/mall/service/ISystemService.java 8 ●●●●● diff | view | raw | blame | history
src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberWalletServiceImpl.java 5 ●●●●● diff | view | raw | blame | history
src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java 2 ●●●●● diff | view | raw | blame | history
src/main/java/cc/mrbird/febs/mall/service/impl/MallMoneyFlowServiceImpl.java 5 ●●●●● diff | view | raw | blame | history
src/main/java/cc/mrbird/febs/mall/service/impl/MemberProfitServiceImpl.java 152 ●●●●● diff | view | raw | blame | history
src/main/java/cc/mrbird/febs/mall/service/impl/SystemServiceImpl.java 45 ●●●●● diff | view | raw | blame | history
src/main/resources/mapper/modules/DataDictionaryCustomMapper.xml 14 ●●●●● diff | view | raw | blame | history
src/main/resources/mapper/modules/MallMemberMapper.xml 59 ●●●●● diff | view | raw | blame | history
src/main/resources/mapper/modules/MallMoneyFlowMapper.xml 8 ●●●●● diff | view | raw | blame | history
src/main/resources/mapper/modules/MallOrderInfoMapper.xml 19 ●●●●● diff | view | raw | blame | history
src/main/resources/static/febs/lay/modules/febs.js 9 ●●●●● diff | view | raw | blame | history
src/main/resources/templates/febs/views/modules/system/profitSetting.html 188 ●●●●● diff | view | raw | blame | history