Merge branch 'master' of http://10.153.19.25:10101/r/HangZhouMes

wang

2024-05-15 43a6eccb37602e27c56bf7c40a74c8350ecfd82e

 hangzhoumesParent/common/servicebase/src/main/java/com/mes/engineering/entity/Engineering.java

File was renamed from hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/engineering/entity/Engineering.java
@@ -89,7 +89,7 @@
    /**
     * 膜系id
     */
    private Integer filmsId;
    private String filmsId;

    /**
     * 备注