parent: befa81 | patch | commitdiff
Helius
2021-11-30 63a3c4db205ffd06325cfc6a6bebcf7d62eba65e
refs
author Helius <wangdoubleone@gmail.com>
Tuesday, November 30, 2021 17:20 +0800
committer Helius <wangdoubleone@gmail.com>
Tuesday, November 30, 2021 17:20 +0800
commit63a3c4db205ffd06325cfc6a6bebcf7d62eba65e
tree 3b90ba5f15124e1ee5f0ab062f7091a9ef2dd381 tree | zip | gz
parent befa8124e15d7d7e2d2026c2596561b11a9ee573 view | diff
ba7ef6a2cfeff873da48469cc775c5f928ea45e8 view | diff 
Merge branch 'score_shop' into api_score_meger
14 files modified
3 files added
892 ■■■■■ changed files
zq-erp/src/main/java/com/matrix/system/app/vo/ServiceProjVo.java 12 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/app/vo/ServiceTcVo.java 12 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/common/dao/SysRolePwoerFnDao.java 1 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/common/service/impl/SysCompanyServiceImpl.java 548 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/hive/action/OrderController.java 2 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/hive/action/ProjServiceController.java 31 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/hive/dao/SysProjServicesDao.java 3 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/hive/dto/ServiceOrderTimeDto.java 34 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/hive/vo/ServiceOrderInfoVo.java 69 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/mybatis/mapper/common/SysRolePwoerFnDao.xml 19 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/mybatis/mapper/hive/SysProjServicesDao.xml 6 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/mybatis/mapper/hive/SysProjUseDao.xml 4 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/static/js/systools/AjaxProxyVue.js 4 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/service_all_list.html 2 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/updateServiceOrderTime.html 7 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/updateServiceOrderTimeV2.html 126 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/vip.html 12 ●●●●● diff | view | raw | blame | history