parent: 945967 | patch | commitdiff
xiaoyong931011
2021-03-17 6914c44553cd49d063f0094afa0a9559e779efde
refs
author xiaoyong931011 <15274802129@163.com>
Wednesday, March 17, 2021 18:16 +0800
committer xiaoyong931011 <15274802129@163.com>
Wednesday, March 17, 2021 18:16 +0800
commit6914c44553cd49d063f0094afa0a9559e779efde
tree 5c1cfc437d7b0d73132d13df568c7695909db0fa tree | zip | gz
parent 94596756df6da51d1ed164f3925db3ceea5e2b0e view | diff
7c5a920b3402e040cc004a24276b9e022da37834 view | diff 
Merge branch 'score_shop' of http://120.27.238.55:7000/r/beauty-erp into score_shop
9 files modified
2 files added
325 ■■■■■ changed files
zq-erp/src/main/java/com/matrix/config/RabbitMqConfig.java 5 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/common/actions/ProjExceptionAction.java 21 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/shopXcx/action/ShopRefundRecordAction.java 21 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxSalesmanAction.java 7 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/shopXcx/api/service/impl/WxShopRefundRecordServiceImpl.java 22 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/shopXcx/mqTask/MQTaskRouting.java 4 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/shopXcx/mqTask/SalesOrderRefundTask.java 43 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/shopXcx/mqTask/SalesOrderTask.java 143 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/config/system.properties 4 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/config/test/system.properties 4 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/templates/views/common/showprojException.html 51 ●●●●● diff | view | raw | blame | history