parent: 501994 | patch | commitdiff
935090232@qq.com
2022-02-22 bbe0a2fd03063316e50cf141986bda984599bbda
refs
author 935090232@qq.com <ak473600000>
Tuesday, February 22, 2022 23:41 +0800
committer 935090232@qq.com <ak473600000>
Tuesday, February 22, 2022 23:41 +0800
commitbbe0a2fd03063316e50cf141986bda984599bbda
tree c2fd39a0b7590d992ff760c3ea7bab391dd933ff tree | zip | gz
parent 50199492d4033f995223c94fdb65297bb13c4505 view | diff
ecbc9879142993ab2e99e2712b5d5bba282c4b72 view | diff 
Merge branch 'developer'

# Conflicts:
#	zq-erp/pom.xml
13 files modified
147 ■■■■■ changed files
zq-erp/src/main/java/com/matrix/system/hive/action/OrderController.java 3 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/hive/action/ProjServiceController.java 5 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/hive/bean/SysOrder.java 31 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/hive/bean/SysProjServices.java 39 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysOrderServiceImpl.java 5 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysProjServicesServiceImpl.java 2 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/mybatis/mapper/hive/SysOrderDao.xml 32 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/mybatis/mapper/hive/SysProjServicesDao.xml 25 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/templates/views/admin/hive-erp/order/projService-list.html 1 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/templates/views/admin/hive-erp/order/sysOrder-list.html 1 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/service_all_list.html 1 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/underlineOrder.html 1 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/templates/views/admin/hive/store/projService-list.html 1 ●●●●● diff | view | raw | blame | history