Merge branch 'bfasrs' of http://47.97.1.152:5880/r/zy-asrs into bfasrs

luxiaotao1123

2023-02-02 5e966ab720ffff2bd0fe55ffda7263606923732d

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

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

        private String cstmr;

    }

}