parent: 2de16d | patch | commitdiff
jyy
2021-04-26 ebbe59b6ee3378fa296441cabe8bb81b2bc200b5
refs
author jyy <935090232@qq.com>
Monday, April 26, 2021 13:47 +0800
committer jyy <935090232@qq.com>
Monday, April 26, 2021 13:47 +0800
commitebbe59b6ee3378fa296441cabe8bb81b2bc200b5
tree 95afac71bd1c48f38c406efe25a0090cdb8d043f tree | zip | gz
parent 2de16d747fe8a7815318874cc2c88bf1bec78e89 view | diff
6f5f676fa88171a754947d539b0b3c3a6371b385 view | diff 
Merge branch 'score_shop' into api_score_meger
27 files modified
1 files added
461 ■■■■■ changed files
zq-erp/src/main/java/com/matrix/config/RabbitMqConfig.java 10 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/activity/action/ActivitySignAwardSetAction.java 38 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/activity/service/ActivitySignAwardSetService.java 10 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/activity/service/ActivitySignWriteoffService.java 2 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/activity/vo/SignReceiveListVo.java 5 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/common/actions/CommonAction.java 8 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/common/constance/AppConstance.java 6 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxShopActivitiesSignAction.java 132 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxShopProduct.java 25 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/shopXcx/api/service/impl/WxShopRefundRecordServiceImpl.java 1 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/shopXcx/api/vo/SignSuccessVo.java 9 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/shopXcx/dao/ShopActivitiesDao.java 2 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/shopXcx/mqTask/MQTaskRouting.java 1 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/shopXcx/mqTask/OrderDingDingNoticeTask.java 64 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/shopXcx/quartz/ShopActivityTimeOutQuartz.java 2 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/mybatis/mapper/activity/ActivitySignReceiveRecordDao.xml 2 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/mybatis/mapper/xcxShop/ShopActivitiesDao.xml 11 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/templates/views/admin/activity/activity-market.html 40 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/templates/views/admin/activity/activity-sign-logistics-info.html 7 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/templates/views/admin/activity/activity-sign-receive.html 10 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/templates/views/admin/activity/activity-sign-update.html 8 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/templates/views/admin/activity/activity-sign-writeoff-info.html 3 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/templates/views/admin/activity/activity-sign-writeoff.html 32 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/templates/views/admin/activity/activity-sign.html 8 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/order-form.html 4 ●●●●● diff | view | raw | blame | history
zq-erp/src/test/java/com/matrix/FenxiaoSoreInitTest.java 2 ●●●●● diff | view | raw | blame | history
zq-erp/src/test/java/com/matrix/JyyTests.java 13 ●●●●● diff | view | raw | blame | history
zq-erp/src/test/java/com/matrix/ParameterSettingsTool.java 6 ●●●●● diff | view | raw | blame | history