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

whycq

2023-09-26 49d91d5206cc9303294ad170cbb7344373d47c59

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

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

        private String cstmr;

    }

}