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

zyx

2024-06-26 358d17658629931964ad421be77c94240310ed63

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

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

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