parent: 715803 | patch | commitdiff
935090232@qq.com
2021-01-17 29ba6fbd0015b9a77b5c994f43429a5a42e2ecc4
refs
author 935090232@qq.com <ak473600000>
Sunday, January 17, 2021 11:35 +0800
committer 935090232@qq.com <ak473600000>
Sunday, January 17, 2021 11:35 +0800
commit29ba6fbd0015b9a77b5c994f43429a5a42e2ecc4
tree 55699ed5f746edbf42f89de66b74138c65a5a281 tree | zip | gz
parent 71580395e958879e49a8449c54c584f7c0b1fc7f view | diff
18feb569dd93c9daae9b9e06cd2adf265a38ff4e view | diff 
Merge remote-tracking branch 'origin/api' into api
8 files modified
69 ■■■■■ changed files
zq-erp/src/main/java/com/matrix/system/app/action/ApiRankingAction.java 2 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/hive/service/imp/AchieveNewServiceImpl.java 2 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysProjServicesServiceImpl.java 4 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/config/application.properties 2 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/mybatis/mapper/hive/SysBusinessDataDao.xml 50 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/mybatis/mapper/hive/SysOrderDao.xml 1 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/order-form.html 2 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/service_all_list.html 6 ●●●●● diff | view | raw | blame | history