parent: 632c48 | patch | commitdiff
xiaoyong931011
2022-06-16 bec7abc34ffb9a9de3f5d225bf233a311ff68938
refs
author xiaoyong931011 <15274802129@163.com>
Thursday, June 16, 2022 16:36 +0800
committer xiaoyong931011 <15274802129@163.com>
Thursday, June 16, 2022 16:36 +0800
commitbec7abc34ffb9a9de3f5d225bf233a311ff68938
tree 7f3d52243078f9c6341f9edd63f02b6a6620e75d tree | zip | gz
parent 632c48891cb0d9df96c96792adb6517a0cd43226 view | diff
b346ab488e094c33937c2dd221a841b1a8be159f view | diff 
Merge branch 'mall-amz' of http://120.27.238.55:7000/r/xc-mall into mall-amz
23 files modified
222 ■■■■■ changed files
src/main/java/cc/mrbird/febs/common/enumerates/MoneyFlowTypeEnum.java 4 ●●●●● diff | view | raw | blame | history
src/main/java/cc/mrbird/febs/common/runner/FebsStartedUpRunner.java 2 ●●●●● diff | view | raw | blame | history
src/main/java/cc/mrbird/febs/mall/dto/MoneyFlowDto.java 2 ●●●●● diff | view | raw | blame | history
src/main/java/cc/mrbird/febs/mall/entity/MallMember.java 2 ●●●●● diff | view | raw | blame | history
src/main/java/cc/mrbird/febs/mall/entity/MallMoneyFlow.java 2 ●●●●● diff | view | raw | blame | history
src/main/java/cc/mrbird/febs/mall/service/impl/MemberProfitServiceImpl.java 48 ●●●●● diff | view | raw | blame | history
src/main/java/cc/mrbird/febs/mall/vo/MoneyFlowVo.java 2 ●●●●● diff | view | raw | blame | history
src/main/java/cc/mrbird/febs/mall/vo/OrderItemVo.java 3 ●●●●● diff | view | raw | blame | history
src/main/java/cc/mrbird/febs/pay/service/impl/PayServiceImpl.java 2 ●●●●● diff | view | raw | blame | history
src/main/resources/mapper/modules/MallGoodsMapper.xml 4 ●●●●● diff | view | raw | blame | history
src/main/resources/mapper/modules/MallMemberMapper.xml 5 ●●●●● diff | view | raw | blame | history
src/main/resources/templates/error/403.html 2 ●●●●● diff | view | raw | blame | history
src/main/resources/templates/error/404.html 2 ●●●●● diff | view | raw | blame | history
src/main/resources/templates/error/500.html 2 ●●●●● diff | view | raw | blame | history
src/main/resources/templates/febs/views/layout.html 2 ●●●●● diff | view | raw | blame | history
src/main/resources/templates/febs/views/login.html 67 ●●●●● diff | view | raw | blame | history
src/main/resources/templates/febs/views/modules/mallMember/agentList.html 8 ●●●●● diff | view | raw | blame | history
src/main/resources/templates/febs/views/modules/mallMember/mallMemberList.html 18 ●●●●● diff | view | raw | blame | history
src/main/resources/templates/febs/views/modules/mallMember/moneyFlow.html 2 ●●●●● diff | view | raw | blame | history
src/main/resources/templates/febs/views/modules/mallMember/moneyFlowList.html 4 ●●●●● diff | view | raw | blame | history
src/main/resources/templates/index.html 2 ●●●●● diff | view | raw | blame | history
src/test/java/cc/mrbird/febs/AgentTest.java 26 ●●●●● diff | view | raw | blame | history
src/test/java/cc/mrbird/febs/ProfitTest.java 11 ●●●●● diff | view | raw | blame | history