parent: de5d98 | patch | commitdiff
935090232@qq.com
2021-07-29 35cea8fd3552a048ed49d0596b647c983e148644
refs
author 935090232@qq.com <ak473600000>
Thursday, July 29, 2021 20:39 +0800
committer 935090232@qq.com <ak473600000>
Thursday, July 29, 2021 20:39 +0800
commit35cea8fd3552a048ed49d0596b647c983e148644
tree 83592aae15ca12757986034598d59ca1580de9b7 tree | zip | gz
parent de5d98edb80742185b91b2d892167b82a8b64430 view | diff
6e670a95d253ffef6d8baf66adb7bc08e6ea14e3 view | diff 
Merge branch 'score_shop' into api_score_meger
1 files deleted
19 files modified
285 ■■■■■ changed files
zq-erp/src/main/java/com/matrix/system/app/action/ApiVipInfoAction.java 11 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/app/authority/AppAuthorityManager.java 7 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/app/dto/CreateServiceOrderDto.java 2 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/app/vo/VipInfoListVo.java 11 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/common/bean/SysRole.java 13 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/common/bean/SysUsers.java 10 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/common/tag/ButtonRoleJsTagProcessor.java 93 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/common/tag/MatrixProcessorDialect.java 1 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/common/tools/DataAuthUtil.java 9 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/hive/action/VipInfoController.java 21 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysOrderServiceImpl.java 3 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysVipInfoServiceImpl.java 9 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/hiveErp/action/ErpVipInfoController.java 20 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/config/mdprd/system.properties 2 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/mybatis/mapper/common/SysRoleDao.xml 14 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/mybatis/mapper/common/SysUsersDao.xml 7 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/mybatis/mapper/hive/SysVipInfoDao.xml 1 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/templates/views/admin/hive-erp/vip/vipInfo-list.html 23 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/templates/views/admin/hive/vip/vipInfo-list.html 20 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/templates/views/admin/sys/sysRole-form.html 8 ●●●●● diff | view | raw | blame | history