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

lsh

2 天以前 3041eb1b0b76b75b916939e77c7ae97a80fe5af3

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

@@ -48,6 +48,7 @@

        // 规格
        private String specs = "";
        private String supp = "";//supp -> po

        // sku
        private String sku = "";