parent: e7eea6 | patch | commitdiff
935090232@qq.com
2021-10-06 23acc4e7eb8673e918620586b96eae25c3e651b2
refs
author 935090232@qq.com <ak473600000>
Wednesday, October 6, 2021 19:59 +0800
committer 935090232@qq.com <ak473600000>
Wednesday, October 6, 2021 19:59 +0800
commit23acc4e7eb8673e918620586b96eae25c3e651b2
tree 182d3377cc8496f04fe7118d5259b9183fcc1356 tree | zip | gz
parent e7eea688585603c5a8f134d92762e8431d885d36 view | diff
4f4fd43c199ff802df896256bc012a7277fdd4a1 view | diff 
Merge remote-tracking branch 'origin/api_score_meger' into api_score_meger

# Conflicts:
#	zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysOrderServiceImpl.java
10 files modified
99 ■■■■■ changed files
zq-erp/src/main/java/com/matrix/system/constance/Dictionary.java 2 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/hive/action/ShoppingGoodsController.java 24 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysOrderServiceImpl.java 29 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/config/dev/config.json 8 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/config/lhx/config.json 8 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/config/mdprd/config.json 8 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/config/prd/config.json 8 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/config/xcx/config.json 8 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/templates/views/admin/hive/products/shoppinggoods-md-list.html 2 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/templates/views/admin/hive/products/shoppinggoods-zb-list.html 2 ●●●●● diff | view | raw | blame | history