parent: da1d7c | patch | commitdiff
jyy
2021-03-17 0c60f5608fc8f738eb138e32f583c329ed5aa81d
refs
author jyy <935090232@qq.com>
Wednesday, March 17, 2021 14:46 +0800
committer jyy <935090232@qq.com>
Wednesday, March 17, 2021 14:46 +0800
commit0c60f5608fc8f738eb138e32f583c329ed5aa81d
tree d7c3af638dd3472883d2e570fff52462d8552dc6 tree | zip | gz
parent da1d7cf5a6b1e12f68646897cde5a125d4ad87f3 view | diff
0bcfecbfb194ab908fc33dee9cae43c7a77b608d view | diff 
Merge remote-tracking branch 'origin/score_shop' into score_shop
11 files modified
2 files added
240 ■■■■■ changed files
zq-erp/src/main/java/com/matrix/system/fenxiao/action/FenXiaoOrderAction.java 4 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/fenxiao/action/FenXiaoUserAction.java 69 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/fenxiao/dao/ShopSalesmanApplyDao.java 3 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/fenxiao/dto/LoadParamSettingBasicDto.java 20 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/fenxiao/dto/LoadParamSettingDto.java 25 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/fenxiao/service/ShopSalesmanApplyService.java 19 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/fenxiao/vo/ShopOrderDetailVo.java 3 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/fenxiao/vo/ShopSalesmanApplyVo.java 4 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/mybatis/mapper/fenxiao/ShopSalesmanApplyDao.xml 16 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/templates/views/admin/fenxiao/fenxiao-apply.html 2 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/templates/views/admin/fenxiao/fenxiao-order.html 2 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/templates/views/admin/fenxiao/fenxiao-update.html 61 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/templates/views/admin/fenxiao/fenxiao-user.html 12 ●●●●● diff | view | raw | blame | history