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

whycq

2024-07-04 c1a75fbe8a68c9e4dfd2c161375dc325a5c13989

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

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

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