Merge branch 'master' of http://47.100.37.243:10080/ZHOU/yunsu

# Conflicts:
#	cloud-model/src/main/java/com/hssx/cloudmodel/service/impl/MouldFileServiceImpl.java

cloud-model/src/main/java/com/hssx/cloudmodel/service/impl/MouldServiceImpl.java

@@ -105,7 +105,7 @@ public class MouldServiceImpl extends ServiceImpl<MouldMapper, Mould> implements
                 if (oldModelNo.indexOf("-") == -1) {
                     newMouldNo.append(oldModelNo).append("-").append("1");
                 } else {
-                    int i = Integer.parseInt(oldModelNo.substring(oldModelNo.length()));
+                    int i = Integer.parseInt(oldModelNo.substring(oldModelNo.length()-1));
                     i++;
                     newMouldNo.append(oldModelNo.substring(0, oldModelNo.length() - 1)).append(i + "");
                 }