parent: 0dfe13 | patch | commitdiff
xiaoyong931011
2021-04-20 55301b09ac1e68bdd081683c4dea9426ecd70460
refs
author xiaoyong931011 <15274802129@163.com>
Tuesday, April 20, 2021 15:31 +0800
committer xiaoyong931011 <15274802129@163.com>
Tuesday, April 20, 2021 15:31 +0800
commit55301b09ac1e68bdd081683c4dea9426ecd70460
tree 5d3ba0122f1bde88cdece6d093adfdc1a6420eed tree | zip | gz
parent 0dfe139c391e5598b241f714aba4ee053ba8dc97 view | diff
8a4e01dd5719ade70b7bebb0dc0348792ddc67c4 view | diff 
Merge branch 'score_shop' of http://120.27.238.55:7000/r/beauty-erp into score_shop
1 files added
7 files modified
117 ■■■■■ changed files
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/YuyueAction.java 3 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/shopXcx/api/pojo/ShopOrderDto.java 2 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/shopXcx/api/tools/WxShopOrderUtil.java 9 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/shopXcx/bean/ShopOrder.java 19 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/shopXcx/dto/CreateGroupBuyDTO.java 2 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/shopXcx/dto/CreateSecKillDTO.java 68 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/config/db/increment/2021-04-20bug.sql 5 ●●●●● diff | view | raw | blame | history