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

2025-04-30 14:35:18 +08:00
parent 274707181b 0794cdeaf1
commit 447dcf2326
22 changed files with 554 additions and 217 deletions
--- a/pqs-device/common-device-biz/src/main/java/com/njcn/device/biz/pojo/dto/PollutionLineDTO.java
+++ b/pqs-device/common-device-biz/src/main/java/com/njcn/device/biz/pojo/dto/PollutionLineDTO.java
@@ -18,6 +18,16 @@ public class PollutionLineDTO {
    @ApiModelProperty("id")
    private String id;

+    private String pid;
+
+    private String pids;
+
+    @ApiModelProperty("监测对象id")
+    private String objId;
+
+    @ApiModelProperty("电网标志 0电网侧 1用户侧")
+    private Integer powerFlag;
+
    @ApiModelProperty("名称")
    private String name;