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

zjj

2024-11-05 af11b74ea0ec26ed8765244b3f51fad5aca9142a

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

@@ -14,12 +14,12 @@
    /**
     *  创建时间
     */
    public String createTime;
    private String createTime;

    public List<MatParam> matDetails;
    private List<MatParam> matDetails;

    @Data
    public class MatParam{
    public static class MatParam{
        /**
         * 商品编号
         */
@@ -58,7 +58,7 @@
        /**
         * 颜色
         */
        private  String color;
        private String color;

        /**
         * 品牌