parent: 491515 | patch | commitdiff
935090232@qq.com
2022-02-18 4506cc81e35921635299078ca24f7dfc92408e1c
refs
author 935090232@qq.com <ak473600000>
Friday, February 18, 2022 11:29 +0800
committer 935090232@qq.com <ak473600000>
Friday, February 18, 2022 11:29 +0800
commit4506cc81e35921635299078ca24f7dfc92408e1c
tree e102ba6b5f5d8b9875f2c3285fac2a73a2692cc0 tree | zip | gz
parent 4915156f5e5b321a48eba19746bbcc740f34a881 view | diff
8300d695f1643dc3286edc545455e816bc18d10c view | diff 
Merge branch 'score_shop' into api_score_meger

# Conflicts:
#	zq-erp/pom.xml
1 files added
12 files modified
227 ■■■■■ changed files
zq-erp/pom.xml 6 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/fenxiao/action/FenXiaoOrderAction.java 54 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/fenxiao/dao/ShopSalesmanOrderDao.java 5 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/fenxiao/service/ShopSalesmanOrderService.java 7 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/fenxiao/vo/FenxiaoOrderListExportVo.java 40 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/fenxiao/vo/LoadFenxiaoOrderBasicVo.java 3 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysOrderServiceImpl.java 9 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/mybatis/mapper/fenxiao/ShopSalesmanOrderDao.xml 68 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/templates/views/admin/fenxiao/fenxiao-order.html 16 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/servicceAddForm.html 2 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/yyServiceAddForm.html 2 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/templates/views/admin/hive/products/goods-form.html 2 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/templates/views/admin/shop/shopUser-list.html 13 ●●●●● diff | view | raw | blame | history