parent: 394f4a | patch | commitdiff
jyy
2021-01-22 f6d898060ce3ab0bbca1924fad724858d4adc296
refs
author jyy <935090232@qq.com>
Friday, January 22, 2021 13:07 +0800
committer jyy <935090232@qq.com>
Friday, January 22, 2021 13:07 +0800
commitf6d898060ce3ab0bbca1924fad724858d4adc296
tree ecc3da4d837af227d73cb5ed6527017f0114b944 tree | zip | gz
parent 394f4a193d56405e9aad63ef2cd8f715cb050bf9 view | diff
6add6b3044b74d654ccb065e63d24bbc96eb0d6f view | diff 
Merge remote-tracking branch 'origin/api' into api
13 files modified
2 files added
344 ■■■■■ changed files
zq-erp/src/main/java/com/matrix/system/app/action/ApiKnowledgeAction.java 4 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/app/action/ApiVipInfoAction.java 6 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/app/action/ApiVipLabelAction.java 63 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/app/dto/LabelDto.java 34 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/app/dto/VipInfoListDto.java 24 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/common/interceptor/ApiUserLoginInterceptor.java 2 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/hive/action/ArticleTypeController.java 4 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/hive/bean/ArticleType.java 11 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/hive/bean/SysVipLabel.java 43 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/hive/bean/SysVipLabelRelate.java 41 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/hive/dao/SysVipLabelDao.java 7 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysVipInfoServiceImpl.java 19 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/mybatis/mapper/hive/ArticleTypeDao.xml 6 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/mybatis/mapper/hive/SysVipInfoDao.xml 3 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/mybatis/mapper/hive/SysVipLabelDao.xml 77 ●●●●● diff | view | raw | blame | history