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

LSH

2023-08-28 bc64e9e55c22153ac194ef010c9349ce3783a1a8

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

@@ -36,6 +36,8 @@
        // 备注
        private String memo;

        private String cstmr;

    }

}