parent: 4d4805 | patch | commitdiff
jyy
2021-01-25 949efdc17fa833f6511c0e5902057f3be0fe72c4
refs
author jyy <935090232@qq.com>
Monday, January 25, 2021 10:58 +0800
committer jyy <935090232@qq.com>
Monday, January 25, 2021 10:58 +0800
commit949efdc17fa833f6511c0e5902057f3be0fe72c4
tree 7d04cc99516f7d4e9a16ccc35ba48d43113b45db tree | zip | gz
parent 4d4805096b898a6e99f31794facb81794bd1fcf7 view | diff
124bbd56064fea49f51ac53f87acd3f974bcf744 view | diff 
Merge branch 'api' into hive2.0

# Conflicts:
#	zq-erp/src/main/resources/config/application.properties
10 files modified
89 ■■■■■ changed files
zq-erp/src/main/java/com/matrix/system/app/action/ApiFollowupAction.java 8 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/app/dto/AddVipDto.java 4 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/app/dto/ModifyVipDto.java 4 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/constance/Dictionary.java 4 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/hive/action/ProjUseController.java 10 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysVipInfoServiceImpl.java 43 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/config/prd/application.properties 6 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/config/test/application.properties 3 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/mybatis/mapper/hive/ArticleDao.xml 3 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/vip.html 4 ●●●●● diff | view | raw | blame | history