代码提交

cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/param/AppProjectQueryParm.java

@@ -5,6 +5,7 @@ import lombok.Data;
 
 import javax.validation.constraints.Min;
 import javax.validation.constraints.NotNull;
+import java.util.List;
 
 /**
  * Description:
@@ -30,7 +31,7 @@ public class AppProjectQueryParm {
     private String projectId;
 
     @ApiModelProperty(value="工程id")
-    private String engineeringId;
+    private List<String> engineeringIds;
 
     @ApiModelProperty(value="起始时间")
 //    @NotNull(message="起始时间不能为空！")

cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/vo/ProjectEquipmentVO.java

@@ -48,5 +48,6 @@ public class ProjectEquipmentVO  {
     @ApiModelProperty(value = "是否是主用户0-否，1-是")
     private String isPrimaryUser;
     private Integer runStatus;
+    private String mac;
 
 }