parent: 812381 | patch | commitdiff
jyy
2021-03-17 0f66a8dc0544e72b0d41adfc69db20ea584c4661
refs
author jyy <935090232@qq.com>
Wednesday, March 17, 2021 18:26 +0800
committer jyy <935090232@qq.com>
Wednesday, March 17, 2021 18:26 +0800
commit0f66a8dc0544e72b0d41adfc69db20ea584c4661
tree a599ef7522c32a423864dd932f70b92a0fb344df tree | zip | gz
parent 81238146f712fb144e7ffd93dfbbe614e8a17db4 view | diff
3b2cbd96086b0195c3fd69d1d8dafee9158cc31d view | diff 
Merge remote-tracking branch 'origin/score_shop' into score_shop
7 files modified
280 ■■■■■ changed files
zq-erp/src/main/java/com/matrix/system/common/service/impl/InitBusParameterSettingService.java 4 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/fenxiao/service/ShopSalesmanApplyService.java 26 ●●●●● 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 2 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/templates/views/admin/fenxiao/fenxiao-order.html 82 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/templates/views/admin/fenxiao/fenxiao-update.html 114 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/templates/views/admin/fenxiao/fenxiao-user.html 48 ●●●●● diff | view | raw | blame | history