parent: 2562e1 | patch | commitdiff
xiaoyong931011
2021-08-13 911297338aece1dedcddd5caaaf875c51c793aec
refs
author xiaoyong931011 <15274802129@163.com>
Friday, August 13, 2021 12:05 +0800
committer xiaoyong931011 <15274802129@163.com>
Friday, August 13, 2021 12:05 +0800
commit911297338aece1dedcddd5caaaf875c51c793aec
tree c6adac89d8718d5cd4b2af1abdc871d687089129 tree | zip | gz
parent 2562e13a8db342cc1e23e17b8a26d84ce314f9eb view | diff
ba099ddee480d063f9c3dd9451207fab2ebbd68c view | diff 
Merge branch 'score_shop' of http://120.27.238.55:7000/r/beauty-erp into score_shop
3 files modified
18 ■■■■■ changed files
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/actions/FileUploadAction.java 8 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/shopXcx/api/service/impl/WXShopOrderServiceImpl.java 2 ●●●●● diff | view | raw | blame | history