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

Junjie

2023-05-26 5f796b6d898663704ca72b7fed9de0ad243af4b6

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

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

        private String cstmr;

    }

}