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

Junjie

2023-06-03 daf21ebd4b8f6672d93f33e68e03959481b10060

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

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

        private String cstmr;

    }

}