parent: 446868 | patch | commitdiff
935090232@qq.com
2022-05-03 afe54403db87c5f04e841350c9312367e10de50f
refs
author 935090232@qq.com <ak473600000>
Tuesday, May 3, 2022 19:11 +0800
committer 935090232@qq.com <ak473600000>
Tuesday, May 3, 2022 19:11 +0800
commitafe54403db87c5f04e841350c9312367e10de50f
tree ce9d33ba72ccdf078963c75feda1c23d44fb6c14 tree | zip | gz
parent 446868d70ffeecaeeffb3bed900c0be97ecadbab view | diff
c542bc64636b92d3abc266c6ad513ec9861322ec view | diff 
Merge branch 'developer'
15 files modified
2 files added
349 ■■■■■ changed files
zq-erp/pom.xml 5 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/app/authority/AppAuthorityManager.java 9 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/common/authority/DefaultAuthorityManager.java 13 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/common/bean/SysCacheValue.java 39 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/common/dao/SysCacheValueDao.java 14 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/common/init/LocalCache.java 183 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/common/interceptor/HostInterceptor.java 3 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/hive/action/ProjUseController.java 6 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/hive/action/ServiceRecordController.java 2 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/hive/dao/ShoppingGoodsDao.java 2 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/hive/dao/SysShopInfoDao.java 3 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/hive/service/imp/ShoppingGoodsServiceImpl.java 31 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/config/application-local.properties 9 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/config/application.properties 2 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/mybatis/mapper/hive/SysBeauticianStateDao.xml 1 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/mybatis/mapper/hive/SysShopInfoDao.xml 7 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/templates/views/admin/hive/products/shoppinggoods-zb-list.html 20 ●●●●● diff | view | raw | blame | history