parent: 63ba1d | patch | commitdiff
JiangYouYao
2022-03-15 b51ab926c93ac946fb9c78cdbad74cdb90e5e7e1
refs
author JiangYouYao <ak473600000>
Tuesday, March 15, 2022 10:48 +0800
committer JiangYouYao <ak473600000>
Tuesday, March 15, 2022 10:48 +0800
commitb51ab926c93ac946fb9c78cdbad74cdb90e5e7e1
tree cc535692ed839189f5928691a443a110fed11f20 tree | zip | gz
parent 63ba1d6a77860f0c4e6e49a59577a7eb0cfbbe02 view | diff
9c5d7547fa9b37c09659c90448ade6df6db4f2de view | diff 
Merge branch 'develop'
5 files modified
34 ■■■■■ changed files
zq-erp/src/main/java/com/matrix/system/common/authority/strategy/AccountPasswordLogin.java 1 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysProjServicesServiceImpl.java 8 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxUserAction.java 2 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/config/application-alpha.properties 21 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/config/prd/system.properties 2 ●●●●● diff | view | raw | blame | history