parent: 945d04 | patch | commitdiff
JiangYouYao
2022-03-15 9c5d7547fa9b37c09659c90448ade6df6db4f2de
refs
author JiangYouYao <ak473600000>
Tuesday, March 15, 2022 10:46 +0800
committer JiangYouYao <ak473600000>
Tuesday, March 15, 2022 10:46 +0800
commit9c5d7547fa9b37c09659c90448ade6df6db4f2de
tree 729690285ea1a226521328aa27d66bc4c17274d7 tree | zip | gz
parent 945d04010ec5cfe2e70744cc3c26a70dbd2237f7 view | diff
ca02d65afc2e6eb186430f1ae78cb6bc73f5e048 view | diff 
Merge remote-tracking branch 'origin/score_shop' into develop
4 files modified
26 ■■■■■ 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/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