parent: a5edcd | patch | commitdiff
xiaoyong931011
2021-04-15 cbbec843f32b5507c04ed394b8e6a7a61c1d23a0
refs
author xiaoyong931011 <15274802129@163.com>
Thursday, April 15, 2021 16:33 +0800
committer xiaoyong931011 <15274802129@163.com>
Thursday, April 15, 2021 16:33 +0800
commitcbbec843f32b5507c04ed394b8e6a7a61c1d23a0
tree a39252cfc2eb64afd3c4ef38deb7e49f1e7e8c76 tree | zip | gz
parent a5edcd8e1ce08384d6b317756a9852be1bb33703 view | diff
2fdc11a7f356bec787a7c7f6301af0b94ef87a4c view | diff 
Merge branch 'score_shop' of http://120.27.238.55:7000/r/beauty-erp into score_shop
15 files modified
4 files added
371 ■■■■■ changed files
zq-erp/src/main/java/com/matrix/core/exception/GlobleExceptionResolver.java 2 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/common/service/impl/SysFunctionServiceImpl.java 12 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/fenxiao/dao/BizUserDao.java 14 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/fenxiao/entity/BizUser.java 188 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/hive/action/ProjUseController.java 5 ●●●●● 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 4 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WXShopOrderAction.java 2 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxCommonAction.java 3 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxMoneyCardUseAction.java 1 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxSkinCheckAction.java 3 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/YuyueAction.java 6 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/config/application.properties 12 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/config/db/increment/推广员.sql 1 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/config/system.properties 2 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/mybatis/mapper/fenxiao/BizUserDao.xml 7 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/mybatis/mapper/hive/SysVipInfoDao.xml 2 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/templates/views/admin/shop/shopOrder-list.html 12 ●●●●● diff | view | raw | blame | history
zq-erp/src/test/java/com/matrix/BizUserToVipInfoTool.java 93 ●●●●● diff | view | raw | blame | history