parent: 814c0e | patch | commitdiff
xiaoyong931011
2021-04-07 beb6e85c9b054e8edced241c3367814a0a19d70c
refs
author xiaoyong931011 <15274802129@163.com>
Wednesday, April 7, 2021 11:42 +0800
committer xiaoyong931011 <15274802129@163.com>
Wednesday, April 7, 2021 11:42 +0800
commitbeb6e85c9b054e8edced241c3367814a0a19d70c
tree f737b8bd823464c66aa7d9574bcdffd4b822fce7 tree | zip | gz
parent 814c0e8a370cbfcc90c9a1308ea0d66092e3f6ae view | diff
5394194396290aa232910a571d6f4ef463a92a6b view | diff 
Merge branch 'score_shop' of http://120.27.238.55:7000/r/beauty-erp into score_shop
13 files modified
1 files added
170 ■■■■■ changed files
zq-erp/src/main/java/com/matrix/ZqErpApplication.java 1 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/config/MvcCoreConfig.java 2 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/config/TaskScheduleConfig.java 10 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/app/action/ApiCommonAction.java 14 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/app/action/ApiSettingAction.java 47 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/job/InvalidTimeJob.java 2 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/job/ServiceOvertimeNoticeJob.java 9 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/shopXcx/quartz/ShopActivityGroupJoinTimeOutQuartz.java 6 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/shopXcx/quartz/ShopActivityPayTimeOutQuartz.java 7 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/shopXcx/quartz/ShopActivityTimeOutQuartz.java 7 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/shopXcx/quartz/ShopAutomaticReceiveQuartz.java 7 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/shopXcx/quartz/ShopCouponQuartz.java 10 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/config/application.properties 2 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/templates/views/admin/fenxiao/fenxiao-user.html 46 ●●●●● diff | view | raw | blame | history