parent: d43eaf | patch | commitdiff
xiaoyong931011
2021-04-14 e6d19def344a8875a2ec850068df41647649b20a
refs
author xiaoyong931011 <15274802129@163.com>
Wednesday, April 14, 2021 16:30 +0800
committer xiaoyong931011 <15274802129@163.com>
Wednesday, April 14, 2021 16:30 +0800
commite6d19def344a8875a2ec850068df41647649b20a
tree db2da9aec6566fd29c7904e178175c7660e11afc tree | zip | gz
parent d43eafe0983ddc7f76c2e1fe77b81a38ad86920c view | diff
1e4e6e8aa4b738320bf8b5a0ee43aa62ca2c13e7 view | diff 
Merge branch 'score_shop' of http://120.27.238.55:7000/r/beauty-erp into score_shop
7 files modified
1 files added
543 ■■■■■ 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/resources/config/application.properties 12 ●●●●● 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