parent: 3bd9c8 | patch | commitdiff
xiaoyong931011
2021-04-28 92329c6daeeb4d369459bfd9ad6b1d2d20b06300
refs
author xiaoyong931011 <15274802129@163.com>
Wednesday, April 28, 2021 15:16 +0800
committer xiaoyong931011 <15274802129@163.com>
Wednesday, April 28, 2021 15:16 +0800
commit92329c6daeeb4d369459bfd9ad6b1d2d20b06300
tree 2ba6b3334f211bcdc7ea975835b3e1253be29d58 tree | zip | gz
parent 3bd9c8ae7429deb4715659413905738c0a2de6db view | diff
2124957e815ab67a6ad34f03546bac3e5e0c7685 view | diff 
Merge branch 'score_shop' of http://120.27.238.55:7000/r/beauty-erp into score_shop

 Conflicts:
	zq-erp/src/test/java/com/matrix/FenxiaoSoreInitTest.java
10 files modified
1 files added
138 ■■■■■ 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/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/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/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/config/test/application.properties 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