Merge remote-tracking branch 'origin/master'

zhoushihao

2024-05-13 ddf7bfc1a172d3ad52f9ae0a728e91d405f2dd49

 hangzhoumesParent/common/servicebase/src/main/java/com/mes/uppattenusage/entity/UpPattenUsage.java

@@ -35,7 +35,7 @@
    /**
     * 膜系id
     */
    private Integer filmsId;
    private String filmsId;

    /**
     * 宽