Merge remote-tracking branch 'origin/master'

zhoushihao

2024-05-29 e86cacf12a7a31261233a60ab2ea1f569cbb6e37

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

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

    /**
     * 宽