parent: 9e10e7 | patch | commitdiff
xiaoyong931011
2021-04-13 9fb0b7d623078e90747ac4a64283f29d4b4d51d6
refs
author xiaoyong931011 <15274802129@163.com>
Tuesday, April 13, 2021 15:11 +0800
committer xiaoyong931011 <15274802129@163.com>
Tuesday, April 13, 2021 15:11 +0800
commit9fb0b7d623078e90747ac4a64283f29d4b4d51d6
tree 844d3a175bf7ff96cd51e6f58331252e041a0611 tree | zip | gz
parent 9e10e7d221c8a7f5ca20ce11d0d721eff5370720 view | diff
519430edff2ce737a5eaedaaa7a0d24c57fe464a view | diff 
Merge branch 'score_shop' of http://120.27.238.55:7000/r/beauty-erp into score_shop

 Conflicts:
	zq-erp/src/main/resources/mybatis/mapper/xcxShop/ShopOrderDao.xml
11 files modified
490 ■■■■■ changed files
zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WXShopOrderAction.java 197 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxCommonAction.java 9 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxMoneyCardUseAction.java 23 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxShopLogisticsQueryAction.java 2 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/shopXcx/api/pojo/ShopOrderDto.java 8 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/shopXcx/api/service/WXShopOrderService.java 2 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/shopXcx/api/service/impl/WXShopOrderServiceImpl.java 32 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/shopXcx/api/service/impl/WxShopLogisticsQueryServiceImpl.java 144 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/shopXcx/bean/ShopOrder.java 29 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/config/db/increment/推广员.sql 4 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/mybatis/mapper/xcxShop/ShopOrderDao.xml 40 ●●●●● diff | view | raw | blame | history