Merge remote-tracking branch 'origin/mdqdasrsVersion' into mdqdasrsVersion

zjj

2024-11-13 340b69790a7a2eff1ff5de75f109dc77f4b4008f

 src/main/java/com/zy/asrs/entity/param/CombParam.java

@@ -41,6 +41,8 @@

        private Double weight;

        private String memo;

    }

}