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

李天宇

2024-09-12 e8650550ebd4d4cdff1426f17d4a14bc7908e992

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

@@ -61,7 +61,7 @@
        private  String color;

        /**
         * 品牌
         * 品牌 -> 类型
         */
        private String brand;