parent: 3a1441 | patch | commitdiff
wzy
2021-11-20 2a7a159b136805612e241e4e8e24affedfc23cc2
refs
author wzy <wzy19931122ai@163.com>
Saturday, November 20, 2021 21:07 +0800
committer wzy <wzy19931122ai@163.com>
Saturday, November 20, 2021 21:07 +0800
commit2a7a159b136805612e241e4e8e24affedfc23cc2
tree b77b20995f1d6dbe9540dd608c66ecf06848709c tree | zip | gz
parent 3a1441d8f6422e81a67e01830c1793ab25d943b0 view | diff
402f3bbfb88548ac2952cd8de6dda68caf8871de view | diff 
Merge branch 'score_shop' of http://120.27.238.55:7000/r/beauty-erp into score_shop
13 files modified
210 ■■■■■ changed files
zq-erp/pom.xml 4 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/config/MvcCoreConfig.java 1 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/app/action/ApiCommonAction.java 3 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/app/action/ApiUsersAction.java 20 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/common/dao/SysUsersDao.java 2 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/common/service/SysUsersService.java 2 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/common/service/impl/SysUsersServiceImpl.java 5 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/common/tools/DataAuthUtil.java 2 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/hive/service/imp/AchieveNewServiceImpl.java 4 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/config/application.properties 12 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/mybatis/mapper/common/SysUsersDao.xml 5 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/mybatis/mapper/hive/SysVipInfoDao.xml 2 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/templates/views/admin/shop/shopAdvertisType-list.html 148 ●●●●● diff | view | raw | blame | history