parent: bf48bb | patch | commitdiff
935090232@qq.com
2021-01-29 ac61bdd7a7f4834d35bf42a06bc766981f50211e
refs
author 935090232@qq.com <ak473600000>
Friday, January 29, 2021 20:27 +0800
committer 935090232@qq.com <ak473600000>
Friday, January 29, 2021 20:27 +0800
commitac61bdd7a7f4834d35bf42a06bc766981f50211e
tree f92f62478dbe58138e33f53f8c76402feeceed28 tree | zip | gz
parent bf48bb112bf8d5b1564eb5ac6e4809909f24887a view | diff
83571cf68bc955b8b804d3402331d1ba7f2f4e6c view | diff 
Merge remote-tracking branch 'origin/hive2.0' into hive2.0

# Conflicts:
#	zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysOrderServiceImpl.java
#	zq-erp/src/main/resources/generated-sources/annotations/com/matrix/system/app/mapper/MoneyCardUseMapperImpl.java
#	zq-erp/src/main/resources/generated-sources/annotations/com/matrix/system/app/mapper/QuestionMapperImpl.java
#	zq-erp/src/main/resources/generated-sources/annotations/com/matrix/system/app/mapper/SysBeauticianStateMapperImpl.java
#	zq-erp/src/main/resources/generated-sources/annotations/com/matrix/system/app/mapper/SysProjUseMapperImpl.java
#	zq-erp/src/main/resources/generated-sources/annotations/com/matrix/system/app/mapper/SysSkinCheckRecordMapperImpl.java
#	zq-erp/src/main/resources/generated-sources/annotations/com/matrix/system/app/mapper/SysStoreInfoMapperImpl.java
#	zq-erp/src/main/resources/generated-sources/annotations/com/matrix/system/app/mapper/SysUsersMapperImpl.java
#	zq-erp/src/main/resources/generated-sources/annotations/com/matrix/system/app/mapper/SysWorkBeatuistaffMapperImpl.java
31 files modified
8 files deleted
1601 ■■■■■ changed files
zq-erp/src/main/java/com/matrix/system/app/action/ApiServiceOrderAction.java 3 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/app/dto/AddVipDto.java 2 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/hive/action/MoneyCardUseController.java 68 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/hive/action/OrderController.java 11 ●●●●● 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/action/ProjUseController.java 39 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/hive/action/TaocanController.java 24 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/hive/bean/MoneyCardUse.java 15 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/hive/bean/SysProjUse.java 14 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/hive/service/MoneyCardUseService.java 6 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/hive/service/SysProjUseService.java 21 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/hive/service/SysVipInfoService.java 5 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/hive/service/imp/MoneyCardUseServiceImpl.java 61 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysOrderServiceImpl.java 163 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysProjUseServiceImpl.java 83 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysVipInfoServiceImpl.java 5 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/hive/statistics/OrderFlowAction.java 5 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/hive/statistics/ServiceStatisticsAction.java 1 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/hiveErp/action/ErpVipInfoController.java 11 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/YuyueAction.java 13 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/config/application.properties 12 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/generated-sources/annotations/com/matrix/system/app/mapper/QuestionMapperImpl.java 83 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/generated-sources/annotations/com/matrix/system/app/mapper/SysBeauticianStateMapperImpl.java 148 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/generated-sources/annotations/com/matrix/system/app/mapper/SysProjServiceMapperImpl.java 66 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/generated-sources/annotations/com/matrix/system/app/mapper/SysProjUseMapperImpl.java 117 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/generated-sources/annotations/com/matrix/system/app/mapper/SysSkinCheckRecordMapperImpl.java 124 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/generated-sources/annotations/com/matrix/system/app/mapper/SysStoreInfoMapperImpl.java 145 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/generated-sources/annotations/com/matrix/system/app/mapper/SysUsersMapperImpl.java 102 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/generated-sources/annotations/com/matrix/system/app/mapper/SysWorkBeatuistaffMapperImpl.java 44 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/mybatis/mapper/hive/MoneyCardUseDao.xml 11 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/mybatis/mapper/hive/SysBeauticianStateDao.xml 4 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/mybatis/mapper/hive/SysOrderFlowDao.xml 5 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/mybatis/mapper/hive/SysProjUseDao.xml 61 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/static/css/styleOne/style.min.css 1 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/templates/views/admin/hive-erp/statistics/jyls.html 24 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/templates/views/admin/hive-erp/statistics/statistics-projSercice-item.html 12 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/vip.html 22 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/templates/views/admin/hive/statistics/jyls.html 48 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/templates/views/admin/hive/statistics/statistics-projSercice-item.html 17 ●●●●● diff | view | raw | blame | history