Merge remote-tracking branch 'origin/phyzasrs-erp-4' into phyzasrs-erp-4

zhangc

2024-12-20 78ff74dfc9c42ee12993ac01c43063d0432231e3

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

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

    private String name;

    private Long value;
    private Object value;

}