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.
钮海涛 06125eab20 Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
#	modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesEsop.java
#	modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesEsopRepository.java
#	modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEsop.java
#	modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesEsopRepository.java
6 years ago
modules Merge remote-tracking branch 'origin/dev' into dev 6 years ago
.gitignore 配置文件优化 禁止提交配置文件防止环境错乱 6 years ago
README.md init 7 years ago
mvn-build.bat 初始化系统配置 7 years ago
pom.xml 修改pom 6 years ago
readme.txt 扩展块功能 7 years ago

README.md