Merge remote-tracking branch 'origin/master'

pqs-device/pq-device/pq-device-api/pom.xml

@@ -26,5 +26,9 @@
             <groupId>com.github.jeffreyning</groupId>
             <artifactId>mybatisplus-plus</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.github.jeffreyning</groupId>
+            <artifactId>mybatisplus-plus</artifactId>
+        </dependency>
     </dependencies>
 </project>

pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/param/RunManageParam.java

@@ -72,4 +72,6 @@ public class RunManageParam extends BaseParam implements Serializable {
     @ApiModelProperty(name = "runFlag", value = "终端状态")
     private List<Integer> runFlag;
 
+    @ApiModelProperty(name = "searchValue", value = "篩選數據")
+    private String searchValue;
 }

pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/vo/RunTimeVO.java

@@ -42,7 +42,6 @@ public class RunTimeVO implements Serializable {
     @ApiModelProperty(name = "loginTime",value = "投运时间")
     private String loginTime;
 
-
     @ApiModelProperty(name = "devType",value = "终端型号")
     private String devType;
 

pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/vo/UserScaleVO.java

@@ -0,0 +1,36 @@
+package com.njcn.device.pq.pojo.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @version 1.0.0
+ * @author: zbj
+ * @date: 2023/04/10
+ */
+@Data
+public class UserScaleVO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 月份
+     */
+    @ApiModelProperty("月份")
+    private String timeId;
+
+    /**
+     * 累计增量
+     */
+    @ApiModelProperty("累计增量")
+    private Integer incrementNum;
+
+    /**
+     * 当月增量
+     */
+    @ApiModelProperty("当月增量")
+    private Integer monthIncrementNum;
+
+}