parent: caec21 | patch | commitdiff
935090232@qq.com
2022-04-24 14f20daccada2ebe169a45a326e13f4744683716
refs
author 935090232@qq.com <ak473600000>
Sunday, April 24, 2022 23:56 +0800
committer 935090232@qq.com <ak473600000>
Sunday, April 24, 2022 23:56 +0800
commit14f20daccada2ebe169a45a326e13f4744683716
tree 9e5e9151a70b658b4cbcfc87069d28f0142014ec tree | zip | gz
parent caec211d381ea6d662049e03c19b3f335758a7f2 view | diff
7883486d235deaf144d42f9964f8aa18d864161e view | diff 
Merge remote-tracking branch 'origin/score_shop' into developer
13 files modified
1 files added
201 ■■■■■ changed files
zq-erp/src/main/java/com/matrix/system/app/action/ApiServiceOrderAction.java 1 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/app/action/AppOccupancyController.java 21 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/app/dto/CreateServiceOrderDto.java 11 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/app/dto/FreeBedDto.java 43 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/common/authority/strategy/AccountPasswordLogin.java 1 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/common/service/impl/SysUsersServiceImpl.java 3 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/hive/action/OrderController.java 1 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/hive/action/ProjUseController.java 11 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysProjServicesServiceImpl.java 28 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxUserAction.java 28 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/shopXcx/api/service/impl/WxShopActivitiesSecKillServiceImpl.java 4 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/config/application-alpha.properties 45 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/config/application.properties 2 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/config/prd/system.properties 2 ●●●●● diff | view | raw | blame | history