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

zwl

昨天 0cb44badbe4d0d6b58c6324d29d3c7193be687f2

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

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

    private String name;

    private Long value;
    private Object value;

}