config/src/main/resources/config/application-test.yml · bedaafbd75a0c1c9b429ad28f2b06a640522d589 · hewei / SiEn · GitLab

Blame History Permalink

Merge branch 'master' of http://119.28.51.83/hewei/Jumeirah into future/sys/userLogin · 45222fd6
```
 Conflicts:
	config/src/main/resources/config/application-test.yml
```
giaogiao committed Nov 04, 2020
45222fd6

application-test.yml 897 Bytes