parent: 918bfb | patch | commitdiff
jyy
2021-07-10 870960399814cff73d1e6ef93fccb11bede8d464
refs
author jyy <jyy>
Saturday, July 10, 2021 09:04 +0800
committer jyy <jyy>
Saturday, July 10, 2021 09:04 +0800
commit870960399814cff73d1e6ef93fccb11bede8d464
tree cedfbb923cfad556ce7316c929e90cb61d7e343c tree | zip | gz
parent 918bfb7afa967b575a57f5880d492534c6e7de4f view | diff
d265a8510ce03fc39124f421ec10f9f797bd5ff5 view | diff 
Merge branch 'score_shop' into api_score_meger

# Conflicts:
#	zq-erp/src/main/java/com/matrix/system/app/action/ApiCommonAction.java
#	zq-erp/src/main/resources/config/application.properties
55 files modified
4 files added
1614 ■■■■■ changed files
zq-erp/pom.xml 4 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/config/MvcCoreConfig.java 12 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/app/action/ApiCommonAction.java 8 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/app/action/ApiServiceOrderAction.java 1 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/app/action/ApiVipInfoAction.java 3 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/app/vo/ShoppingGoodsDetailVo.java 154 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/common/actions/AdminAction.java 2 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/common/authority/DefaultAuthorityManager.java 40 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/common/interceptor/UserLoginInterceptor.java 3 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/hive/action/CardLevelController.java 2 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/hive/action/CustomerController.java 3 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/hive/action/MoneyCardUseController.java 57 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/hive/action/ProjServiceController.java 1 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/hive/action/VipInfoController.java 178 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/hive/bean/AchieveNew.java 9 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/hive/bean/ShoppingGoods.java 7 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/hive/bean/SysProjUseFlow.java 112 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/hive/dao/MoneyCardUseDao.java 8 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/hive/dao/QuestionDao.java 2 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/hive/dao/ShoppingGoodsDao.java 2 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/hive/dao/SysOrderItemDao.java 2 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/hive/dao/SysProjUseDao.java 2 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/hive/service/QuestionSerivce.java 2 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/hive/service/imp/MoneyCardUseServiceImpl.java 20 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/hive/service/imp/QuestionServiceImpl.java 4 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/hive/service/imp/ShoppingGoodsServiceImpl.java 10 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysOrderServiceImpl.java 43 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysProjUseServiceImpl.java 150 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysWorktimeServiceImpl.java 25 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/hiveErp/action/ErpOrderController.java 31 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/hiveErp/action/ErpVipInfoController.java 4 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/job/InvalidTimeJob.java 37 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/YuyueAction.java 1 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/findC.java 50 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/config/application.properties 14 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/config/mdPrd/application.properties 70 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/config/mdPrd/config.json 94 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/config/mdPrd/system.properties 104 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/config/system.properties 3 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/mybatis/mapper/hive/AchieveNewDao.xml 3 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/mybatis/mapper/hive/MoneyCardUseDao.xml 9 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/mybatis/mapper/hive/QuestionDao.xml 5 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/mybatis/mapper/hive/ShoppingGoodsDao.xml 4 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/mybatis/mapper/hive/SysOrderItemDao.xml 9 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/mybatis/mapper/hive/SysProjUseDao.xml 12 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/templates/views/admin/hive-erp/order/orderXq-form.html 2 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/templates/views/admin/hive-erp/statistics/daily-list-new.html 75 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/print-order.html 2 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/print-service.html 2 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/vip.html 11 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/yypb-form.html 4 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/templates/views/admin/hive/statistics/daily-list-new.html 81 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/templates/views/admin/hive/vip/question-form.html 2 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/templates/views/admin/hive/vip/question-list.html 2 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/templates/views/admin/hive/vip/vipInfo-form.html 17 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/templates/views/admin/index.html 6 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/权限 24 ●●●●● diff | view | raw | blame | history
zq-erp/src/test/java/com/matrix/JyyTests.java 54 ●●●●● diff | view | raw | blame | history
zq-erp/src/test/java/com/matrix/TcProjTest.java 16 ●●●●● diff | view | raw | blame | history