parent: 95e243 | patch | commitdiff
xiaoyong931011
2021-03-17 5041501b2eb692573e4f30e7cc4459149c117da6
refs
author xiaoyong931011 <15274802129@163.com>
Wednesday, March 17, 2021 11:50 +0800
committer xiaoyong931011 <15274802129@163.com>
Wednesday, March 17, 2021 11:50 +0800
commit5041501b2eb692573e4f30e7cc4459149c117da6
tree 87df4aed7f37c0a2ad4460a04cca066bb47bad11 tree | zip | gz
parent 95e243f16ae50cc727767880311af8c5b8f397f8 view | diff
effd505edb4985b5f22de82c6c92e24e102ac778 view | diff 
Merge branch 'score_shop' of http://120.27.238.55:7000/r/beauty-erp into score_shop
5 files modified
601 ■■■■■ changed files
zq-erp/src/main/java/com/matrix/system/hive/action/OrderController.java 2 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/templates/views/admin/hive-erp/order/orderXq-form.html 39 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/templates/views/admin/hive-erp/statistics/daily-list-new.html 462 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/orderXq-form.html 13 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/templates/views/admin/hive/statistics/daily-list-new.html 85 ●●●●● diff | view | raw | blame | history