parent: 8f5aa8 | patch | commitdiff
xiaoyong931011
2021-04-13 ee0fc4d9b4412cc1c0365b8ac7dd43b78f98a038
refs
author xiaoyong931011 <15274802129@163.com>
Tuesday, April 13, 2021 19:56 +0800
committer xiaoyong931011 <15274802129@163.com>
Tuesday, April 13, 2021 19:56 +0800
commitee0fc4d9b4412cc1c0365b8ac7dd43b78f98a038
tree 7418569d1010213ef1cd7d609f9f8f48e702c45c tree | zip | gz
parent 8f5aa8192e7e208fe68ac39409669ef6fcb6b53b view | diff
c5f009b990f649fdbcd004305d49736fd41f3a22 view | diff 
Merge branch 'score_shop' of http://120.27.238.55:7000/r/beauty-erp into score_shop
10 files modified
1 files added
530 ■■■■■ changed files
zq-erp/src/main/java/com/matrix/system/hive/action/ProjServiceController.java 17 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/hive/service/SysProjServicesService.java 5 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysProjServicesServiceImpl.java 35 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WXShopOrderAction.java 2 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxMoneyCardUseAction.java 2 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/shopXcx/api/service/impl/WXShopOrderServiceImpl.java 1 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/mybatis/mapper/xcxShop/ShopProductCommentDao.xml 4 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/servicceAddForm.html 10 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/yyServiceAddForm.html 347 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/yypb-form.html 103 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/templates/views/admin/sys/customerDataDictionary-list.html 4 ●●●●● diff | view | raw | blame | history