parent: 08ff3d | patch | commitdiff
xiaoyong931011
2021-03-12 ff517178453b21a9bb084c1ed39def9f7e4f45f3
refs
author xiaoyong931011 <15274802129@163.com>
Friday, March 12, 2021 13:53 +0800
committer xiaoyong931011 <15274802129@163.com>
Friday, March 12, 2021 13:53 +0800
commitff517178453b21a9bb084c1ed39def9f7e4f45f3
tree be4d050a8b2a65bb614f004d66603e3ced2f96b7 tree | zip | gz
parent 08ff3d86f32498d1041d82746a3554563e051301 view | diff
c4dcb4f6c48546baa7a112aa5cd8e0548e02ed05 view | diff 
Merge branch 'score_shop' of http://120.27.238.55:7000/r/beauty-erp into score_shop
7 files modified
4 files added
288 ■■■■■ changed files
zq-erp/src/main/java/com/matrix/biz/bean/BizUser.java 6 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/fenxiao/dao/ShopSalesmanOrderItemDao.java 13 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/fenxiao/entity/ShopSalesmanOrder.java 19 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/fenxiao/entity/ShopSalesmanOrderItem.java 54 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/fenxiao/service/ShopSalesmanOrderItemService.java 20 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/shopXcx/mqTask/OrderTask.java 69 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/config/db/increment/推广员.sql 23 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/config/test/application.properties 2 ●●●●● 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/mybatis/mapper/fenxiao/ShopSalesmanOrderItemDao.xml 33 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/templates/views/admin/shop/shopProduct-form.html 47 ●●●●● diff | view | raw | blame | history