parent: 60d996 | patch | commitdiff
jyy
2021-03-16 72396cbbb60d0418dd4cb63f310532fc70a28c10
refs
author jyy <935090232@qq.com>
Tuesday, March 16, 2021 17:59 +0800
committer jyy <935090232@qq.com>
Tuesday, March 16, 2021 17:59 +0800
commit72396cbbb60d0418dd4cb63f310532fc70a28c10
tree 1b6fd1c13e928b55bbfb43e26380536a4c69de52 tree | zip | gz
parent 60d996294b436d557a86817ab5db50a8814da5fe view | diff
1028a2a78292ce0942bf9c07c23cfb22a33c4600 view | diff 
Merge remote-tracking branch 'origin/score_shop' into score_shop

# Conflicts:
#	zq-erp/src/main/java/com/matrix/system/fenxiao/service/ShopSalesmanApplyService.java
17 files modified
487 ■■■■■ changed files
zq-erp/src/main/java/com/matrix/system/fenxiao/action/FenXiaoSettingAction.java 24 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/fenxiao/action/FenXiaoUserAction.java 4 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/fenxiao/dto/LoadFenxiaoOrderListDto.java 26 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/fenxiao/dto/LoadSetOrderListDtoDto.java 8 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/fenxiao/dto/UpdateSetOrderDoneDto.java 15 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/fenxiao/entity/ShopRevenueFlow.java 10 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/fenxiao/entity/ShopSalemanSettlement.java 13 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/fenxiao/service/ShopSalesmanApplyService.java 7 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/fenxiao/service/ShopSalesmanOrderService.java 130 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/fenxiao/vo/LoadFenxiaoOrderListVo.java 2 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/fenxiao/vo/LoadSetOrderListDtoVo.java 11 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/hive/service/CodeService.java 7 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/hive/service/imp/CodeServiceImpl.java 5 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/mybatis/mapper/fenxiao/ShopSalesmanApplyDao.xml 4 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/mybatis/mapper/fenxiao/ShopSalesmanOrderDao.xml 48 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/templates/views/admin/fenxiao/fenxiao-order.html 169 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/templates/views/admin/fenxiao/fenxiao-user.html 4 ●●●●● diff | view | raw | blame | history