parent: 81eaf1 | patch | commitdiff
jyy
2021-04-09 63170eb558babf81890cb23a453680e1054ecf85
refs
author jyy <935090232@qq.com>
Friday, April 9, 2021 17:48 +0800
committer jyy <935090232@qq.com>
Friday, April 9, 2021 17:48 +0800
commit63170eb558babf81890cb23a453680e1054ecf85
tree 9388f3d867e047e0f22b2bbb87d46d49e4c3826b tree | zip | gz
parent 81eaf1aea588f309b35a51b836643a5b97f83e3d view | diff
0cd61f7b848c04e2fc431e03272e1b27c3a171cd view | diff 
Merge remote-tracking branch 'origin/score_shop' into score_shop
6 files modified
62 ■■■■■ changed files
zq-erp/pom.xml 2 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/app/vo/BusinessesDataShowVo.java 22 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/mybatis/mapper/hive/AchieveNewDao.xml 6 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/mybatis/mapper/hive/SysBusinessDataDao.xml 24 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/templates/views/admin/hive-erp/order/orderXq-form.html 4 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/orderXq-form.html 4 ●●●●● diff | view | raw | blame | history