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.

Dominic_Xiao 8e3943b306 Merge remote-tracking branch 'remotes/origin/test' into dev ... # Conflicts: # modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/PackageDetailModel.java		5 years ago
..
src/main/java/cn/estsh/i3plus/pojo/mes	Merge remote-tracking branch 'remotes/origin/test' into dev	5 years ago
pom.xml	revert(pojo):还原pom版本	5 years ago