Merge remote-tracking branch 'origin/wz-JiAo-wms' into wz-JiAo-wms

野心家

12 小时以前 5127f46eedeede5cbfeae7a4908ddac11d332494

 src/main/java/com/zy/asrs/entity/result/KeyValueVo.java

@@ -10,6 +10,6 @@

    private String name;

    private Long value;
    private Object value;

}