parent: 4ad105 | patch | commitdiff
935090232@qq.com
2021-06-18 0de4720110cc7ce35d1565bdd5706d6b9a0b3982
refs
author 935090232@qq.com <ak473600000>
Friday, June 18, 2021 22:10 +0800
committer 935090232@qq.com <ak473600000>
Friday, June 18, 2021 22:10 +0800
commit0de4720110cc7ce35d1565bdd5706d6b9a0b3982
tree 20c2d03142e9ebcc70ebee81d0bc50896cc8f01f tree | zip | gz
parent 4ad105d87c06b9d7ded694451ea752cbbad9e129 view | diff
bdda3d8531513e32e0a079def5a3e342907a2ef7 view | diff 
Merge branch 'score_shop' into api_score_meger
8 files modified
174 ■■■■■ changed files
zq-erp/src/main/java/com/matrix/system/hive/bean/AchieveNew.java 17 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/hive/service/imp/AchieveNewServiceImpl.java 19 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysOrderServiceImpl.java 32 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/hive/statistics/AchieveAction.java 65 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/mybatis/mapper/hive/AchieveNewDao.xml 3 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/templates/views/admin/hive-erp/statistics/daily-list-new.html 11 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/order-form.html 17 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/templates/views/admin/hive/statistics/daily-list-new.html 10 ●●●●● diff | view | raw | blame | history