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

whycq

2023-03-09 392aebed0af81c8369a3f07dfdc53cad1b59f6b4

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

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

        private String cstmr;

    }

}