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

lty

昨天 01fa93b5dd9f20286ef8f22515caf55307f76a9d

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

@@ -19,7 +19,7 @@
    public List<MatParam> matDetails;

    @Data
    public class MatParam{
    public static class MatParam{
        /**
         * 商品编号
         */