parent: 4ae053 | patch | commitdiff
jyy
2021-04-14 6ada97d503bd93722c081b66a9adcce7599e5536
refs
author jyy <935090232@qq.com>
Wednesday, April 14, 2021 17:31 +0800
committer jyy <935090232@qq.com>
Wednesday, April 14, 2021 17:31 +0800
commit6ada97d503bd93722c081b66a9adcce7599e5536
tree 9aa22d2bf1b79d6e00517b5f1e5fb267fcfca3b5 tree | zip | gz
parent 4ae053d60246a7f3279b6f1d3f2185d6fb1dee81 view | diff
e6d19def344a8875a2ec850068df41647649b20a view | diff 
Merge remote-tracking branch 'origin/score_shop' into score_shop

# Conflicts:
#	zq-erp/src/main/resources/config/application.properties
12 files modified
1 files added
761 ■■■■■ changed files
zq-erp/src/main/java/com/matrix/system/hive/action/ProjServiceController.java 10 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/hive/service/SysProjServicesService.java 2 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysProjServicesServiceImpl.java 12 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/shopXcx/action/ShopOrderAction.java 138 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/shopXcx/vo/LogisticsImportVo.java 14 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/config/application.properties 10 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/mybatis/mapper/xcxShop/ShopOrderDao.xml 2 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/static/js/function/vip.js 2 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/service_all_list.html 2 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/yypb-form-bak.html 498 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/yypb-form.html 5 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/templates/views/admin/shop/logisticsImport-form.html 2 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/templates/views/admin/shop/shopOrder-list.html 64 ●●●●● diff | view | raw | blame | history