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

Junjie

2023-03-20 7bea8428d74527993cb4ae47d01c79850b5f34bc

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

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

        private String cstmr;

    }

}