parent: 2c4462 | patch | commitdiff
935090232@qq.com
2021-10-06 e7eea688585603c5a8f134d92762e8431d885d36
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
commite7eea688585603c5a8f134d92762e8431d885d36
tree a2294ddb252b3f936aa473877f9639249e4a486c tree | zip | gz
parent 2c44627f994fc2dadd507a5795ce750730c691f8 view | diff
3b1346a8ac5e6665884671223166acbdef7426ab view | diff 
Merge branch 'score_shop' into api_score_meger

# Conflicts:
#	zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysOrderServiceImpl.java
#	zq-erp/src/main/resources/templates/views/super/sysCompany-form.html
50 files modified
1 files added
1039 ■■■■■ changed files
zq-erp/src/main/java/com/matrix/config/CrossOriginConfig.java 33 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/app/action/ApiCommonAction.java 5 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/app/vo/BusinessesDataShowVo.java 2 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/app/vo/ServiceProjVo.java 22 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/common/actions/CommonAction.java 8 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/common/actions/FileUploadAction.java 8 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/common/actions/SysCompanyAction.java 11 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/common/bean/SysRole.java 10 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/common/constance/AppConstance.java 5 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/common/interceptor/ApiUserLoginInterceptor.java 10 ●●●●● 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/OrderController.java 99 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/hive/action/ProjServiceController.java 24 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/hive/action/ProjUseController.java 2 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/hive/action/ShopInfoController.java 5 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/hive/action/ShoppingGoodsController.java 2 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/hive/dao/AchieveNewDao.java 4 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/hive/service/AchieveNewService.java 10 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/hive/service/imp/AchieveNewServiceImpl.java 2 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysOrderServiceImpl.java 26 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/hive/statistics/AchieveAction.java 10 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/hive/statistics/SysBusinessDataAction.java 48 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/hive/statistics/VipStatisticsAction.java 8 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/shopXcx/action/ShopDeliveryInfoAction.java 2 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/shopXcx/action/ShopProductAction.java 26 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/shopXcx/api/WeChatApiTools.java 1 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxBindingPhoneNumber.java 38 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxShareProductAction.java 23 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxUserAction.java 30 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/shopXcx/api/service/impl/WXShopOrderServiceImpl.java 2 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/findC.java 2 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/config/application.properties 12 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/mybatis/mapper/common/SysRoleDao.xml 24 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/mybatis/mapper/hive/AchieveNewDao.xml 370 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/mybatis/mapper/hive/MoneyCardUseDao.xml 4 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/mybatis/mapper/hive/SysProjUseDao.xml 2 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/mybatis/mapper/xcxShop/ShopDeliveryInfoDao.xml 6 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/templates/views/admin/hive-erp/order/projService-list.html 2 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/templates/views/admin/hive-erp/order/sysOrder-list.html 2 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/templates/views/admin/hive-erp/statistics/daily-sum-list-new.html 36 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/order-form.html 14 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/service_all_list.html 9 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/underlineOrder.html 9 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/yypb-form.html 2 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/templates/views/admin/hive/printTemplates/print-service-meidu.html 2 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/templates/views/admin/hive/statistics/daily-sum-list-new.html 35 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/templates/views/admin/shop/shopUser-list.html 2 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/templates/views/admin/sys/sysRole-form.html 6 ●●●●● diff | view | raw | blame | history
zq-erp/src/test/java/com/matrix/ParameterSettingsTool.java 8 ●●●●● diff | view | raw | blame | history
zq-xcx/app.js 2 ●●●●● diff | view | raw | blame | history
zq-xcx/utils/util.js 12 ●●●●● diff | view | raw | blame | history