parent: c0dc76 | patch | commitdiff
jyy
2021-01-16 522f32b832e47a1e0cb01b0b495d16ada34366a6
refs
author jyy <935090232@qq.com>
Saturday, January 16, 2021 15:00 +0800
committer jyy <935090232@qq.com>
Saturday, January 16, 2021 15:00 +0800
commit522f32b832e47a1e0cb01b0b495d16ada34366a6
tree 87106074ad9a9dc3d0bb6432c22b0c31ccc52775 tree | zip | gz
parent c0dc765ad93846078718bb15976905c34db7584c view | diff
e30c7bf3c662667ad20fe8eb850c8dd6ca149965 view | diff 
Merge remote-tracking branch 'origin/api' into api

# Conflicts:
#	zq-erp/src/main/java/com/matrix/system/hive/dao/SysOrderDao.java
#	zq-erp/src/main/resources/mybatis/mapper/hive/SysOrderDao.xml
9 files modified
126 ■■■■■ changed files
zq-erp/src/main/java/com/matrix/system/app/action/ApiRankingAction.java 30 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/app/vo/UserAchieveVo.java 6 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/hive/bean/AchieveNew.java 10 ●●●●● 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/service/SysOrderService.java 1 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysOrderServiceImpl.java 31 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysVipInfoServiceImpl.java 2 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/mybatis/mapper/hive/AchieveNewDao.xml 41 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/mybatis/mapper/hive/SysVipInfoDao.xml 3 ●●●●● diff | view | raw | blame | history