parent: 16b4c2 | patch | commitdiff
935090232@qq.com
2021-01-06 33d82cdff305ce4cb784638edc258b7bb8397353
refs
author 935090232@qq.com <ak473600000>
Wednesday, January 6, 2021 15:44 +0800
committer 935090232@qq.com <ak473600000>
Wednesday, January 6, 2021 15:44 +0800
commit33d82cdff305ce4cb784638edc258b7bb8397353
tree 711bd0e7afde254a75d60f9468fe7d9abebd9e89 tree | zip | gz
parent 16b4c2a0288491a4c610c4af7c5b3ac87d98d68d view | diff
36e1c7f4df538bd75b24c8525771ba726e17d3d3 view | diff 
Merge remote-tracking branch 'origin/api' into api

# Conflicts:
#	zq-erp/src/main/java/com/matrix/system/app/action/ApiCommonAction.java
39 files modified
24 files added
2990 ■■■■■ changed files
zq-erp/src/main/java/com/matrix/system/app/action/ApiCommonAction.java 16 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/app/action/ApiKnowledgeAction.java 51 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/app/action/ApiRankingAction.java 100 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/app/action/ApiServiceOrderAction.java 42 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/app/action/ApiShopInfoAction.java 42 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/app/action/ApiSkinCheckAction.java 80 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/app/action/ApiStatisticsAction.java 222 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/app/action/ApiUsersAction.java 38 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/app/action/ApiVipInfoAction.java 65 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/app/dto/ArticleListDto.java 26 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/app/dto/BusinessesDto.java 45 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/app/dto/QuestionAnswerDto.java 38 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/app/dto/QuestionAnswerItemDto.java 56 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/app/dto/RankingDto.java 43 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/app/dto/SkinCheckListDto.java 22 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/app/dto/UsersQueryDto.java 23 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/app/dto/VipStatisticsParamDto.java 100 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/app/mapper/MoneyCardUseMapper.java 21 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/app/mapper/QuestionMapper.java 31 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/app/mapper/SysSkinCheckRecordMapper.java 38 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/app/mapper/SysUsersMapper.java 2 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/app/vo/BeauticianVo.java 30 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/app/vo/BusinessesDataShowVo.java 111 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/app/vo/QuestionVo.java 88 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/app/vo/RankingVo.java 69 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/app/vo/SkinCheckAnalysisItems.java 77 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/app/vo/SkinCheckDetailVo.java 80 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/app/vo/SkinCheckDiagnoseItemVo.java 31 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/app/vo/SkinCheckListVo.java 69 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/app/vo/UserInfoVo.java 11 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/app/vo/VipAchieveDataShowVo.java 147 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/app/vo/VipCardListVo.java 78 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/app/vo/VipInfoListVo.java 12 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/hive/action/ArticleTypeController.java 15 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/hive/bean/Article.java 4 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/hive/bean/ArticleType.java 10 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/hive/bean/SysOrder.java 10 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/hive/bean/SysSkinCheckRecord.java 11 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/hive/dao/AchieveNewDao.java 5 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/hive/dao/ArticleDao.java 4 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/hive/dao/SysBusinessDataDao.java 5 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/hive/dao/SysOrderDao.java 5 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/hive/service/ArticleService.java 1 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/hive/service/SysOrderService.java 5 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/hive/service/imp/ArticleServiceImpl.java 7 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/hive/service/imp/DataAnalysisCustomerServiceImpl.java 192 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysOrderServiceImpl.java 11 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/hiveErp/action/DataAnalysisCustomer.java 73 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/hiveErp/analysUtil/Caculate.java 4 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/hiveErp/analysUtil/StatisticsParamVo.java 35 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/hiveErp/dao/TjVipSumDao.java 32 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/shopXcx/dao/ShopProductDao.java 2 ●●●●● 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/common/SysUsersDao.xml 2 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/mybatis/mapper/hive/AchieveNewDao.xml 56 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/mybatis/mapper/hive/ArticleDao.xml 13 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/mybatis/mapper/hive/ArticleTypeDao.xml 14 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/mybatis/mapper/hive/SysBusinessDataDao.xml 85 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/mybatis/mapper/hive/SysOrderDao.xml 58 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/mybatis/mapper/hive/SysSkinCheckRecordDao.xml 9 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/mybatis/mapper/hive/SysVipInfoDao.xml 13 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/mybatis/mapper/hive/TjVipSumDao.xml 393 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/mybatis/mapper/xcxShop/ShopProductDao.xml 10 ●●●●● diff | view | raw | blame | history