parent: 562247 | patch | commitdiff
Helius
2021-11-02 be9b2404f95523923ceaacdc3e127a07da7c96a2
refs
author Helius <wangdoubleone@gmail.com>
Tuesday, November 2, 2021 16:18 +0800
committer Helius <wangdoubleone@gmail.com>
Tuesday, November 2, 2021 16:18 +0800
commitbe9b2404f95523923ceaacdc3e127a07da7c96a2
tree 0604c39eb0817d069d6ddb8455d98b7177480d9f tree | zip | gz
parent 56224771711dddfbd42bc7fa7f3449b3d72b30d0 view | diff
ba169443d174c669ffd0bbeca8f277fceb8444e1 view | diff 
Merge branch 'ty_fix' into alpha
27 files modified
3 files added
564 ■■■■■ changed files
zq-erp/src/main/java/com/matrix/system/app/action/ApiCommonAction.java 7 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/app/action/ApiRankingAction.java 13 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/app/action/ApiSettingAction.java 15 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/app/dto/RankingDto.java 3 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/app/dto/SettingDto.java 13 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/app/vo/VipInfoVo.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/service/BusParameterSettingService.java 40 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/hive/action/VipInfoController.java 1 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/hive/bean/AchieveNew.java 6 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/hive/bean/SysVipInfo.java 4 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/hive/dao/AchieveNewDao.java 2 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/hive/dao/SysOrderDao.java 3 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/hive/dao/SysVipInfoDao.java 5 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/hive/service/SysOrderService.java 3 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/hive/service/SysVipInfoService.java 5 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/hive/service/TaiYanAliyunSmsService.java 48 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/hive/service/imp/AchieveNewServiceImpl.java 50 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysOrderServiceImpl.java 5 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysProjServicesServiceImpl.java 77 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysVipInfoServiceImpl.java 15 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/hive/statistics/VipStatisticsAction.java 17 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/config/application.properties 10 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/mybatis/mapper/hive/AchieveNewDao.xml 46 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/mybatis/mapper/hive/SysOrderDao.xml 6 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/mybatis/mapper/hive/SysVipInfoDao.xml 60 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/vip.html 1 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/templates/views/admin/hive/statistics/vip-arrears-list.html 79 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/templates/views/admin/index.html 2 ●●●●● diff | view | raw | blame | history
zq-erp/src/test/java/com/matrix/ParameterSettingsTool.java 13 ●●●●● diff | view | raw | blame | history