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/MouldFileServiceImpl.java

@@ -385,7 +385,7 @@ public class MouldFileServiceImpl extends ServiceImpl<MouldFileMapper, MouldFile
                     String[] split = fileNamePrex.split("\\+");
                     System.out.println("split" + split);
                     for (Part part : partLists) {
-                        if (split[0] == part.getPartNo()) {
+                        if (part.getPartNo().equals(split[0])) {
                             partFile.setPartId(part.getId());
                         }
                         if (Constant.PART_FILE_2D.equals(split[1])) {