Merge remote-tracking branch 'origin/haucheng_panzhihua' into haucheng_panz...

luoxinwu

2024-03-05 c88d1658a2b6b51ed1a81c3be3e9102b661970f3

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/property/ComPropertyAlarmVO.java

@@ -10,7 +10,7 @@
@Data
@ApiModel("")
public class ComPropertyAlarmVO {
    private Integer id;
    private String id;

    /**
     * 设备号