parent: f11cd5 | patch | commitdiff
jyy
2021-05-22 7a8716132ea660525d4790349e05d59b3c369bb6
refs
author jyy <jyy>
Saturday, May 22, 2021 17:31 +0800
committer jyy <jyy>
Saturday, May 22, 2021 17:31 +0800
commit7a8716132ea660525d4790349e05d59b3c369bb6
tree 9d87883deb686489e19f59ac1b6080dca65f1efd tree | zip | gz
parent f11cd5aa3a2e06171ccbbf6c76dbb8fa0c5e7398 view | diff
a28e9ff71db3fa3efe1b7308eafd7c5f83145866 view | diff 
Merge branch 'score_shop' into api_score_meger

# Conflicts:
#	zq-erp/src/main/resources/config/application.properties
21 files modified
1 files added
473 ■■■■■ changed files
zq-erp/pom.xml 2 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/config/MvcCoreConfig.java 1 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/common/constance/AppConstance.java 2 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/hive/dao/SysVipInfoDao.java 2 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysVipInfoServiceImpl.java 5 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/shopXcx/action/ShopRefundRecordAction.java 7 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxRefundRecordAction.java 13 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxSalesProductAction.java 32 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxSalesmanAction.java 6 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxShopProduct.java 2 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxUserAction.java 13 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/shopXcx/api/service/impl/WXShopOrderServiceImpl.java 9 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/shopXcx/api/service/impl/WxShopRefundRecordServiceImpl.java 22 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/shopXcx/mqTask/OrderDingDingNoticeTask.java 24 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/shopXcx/mqTask/SalesOrderRefundTask.java 21 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/config/application.properties 13 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/mybatis/mapper/common/SysUsersDao.xml 2 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/mybatis/mapper/hive/SysVipInfoDao.xml 7 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/templates/views/admin/shop/shopOrder-form.html 4 ●●●●● diff | view | raw | blame | history
zq-erp/src/test/java/com/matrix/JyyTests.java 41 ●●●●● diff | view | raw | blame | history
zq-erp/src/test/java/com/matrix/JyyTests2.java 241 ●●●●● diff | view | raw | blame | history
zq-xcx/project.config.json 4 ●●●●● diff | view | raw | blame | history