moud 修改

moud 修改
Merge remote-tracking branch 'origin/mirror' into mirror

Conflicts:
	JNLXC2.0/src/main/java/com/zb/jnlxc/model/Mould.java
Merge remote-tracking branch 'origin/mirror' into mirror

Conflicts:
	JNLXC2.0/src/main/java/com/zb/jnlxc/model/Mould.java
Merge remote-tracking branch 'origin/mirror' into mirror

Conflicts:
	JNLXC2.0/src/main/java/com/zb/jnlxc/model/Mould.java