You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
wei.peng 725cfb8ec6 Merge branches 'dev' and 'test' of http://git.estsh.com/i3-Andon/i3plus-andon into test
# Conflicts:
#	src/main/resources/application-dev.properties
版本合并  环境标识 test to docker
6 years ago
modules Merge branches 'dev' and 'test' of http://git.estsh.com/i3-Andon/i3plus-andon into test 6 years ago
.gitignore 配置文件优化 禁止提交配置文件防止环境错乱 6 years ago
README.md init 7 years ago
pom.xml Merge remote-tracking branch 'origin/dev' into test 6 years ago

README.md