合并代码

src/main/java/com/gxwebsoft/tower/entity/TowerProject.java

@@ -111,12 +111,20 @@ public class TowerProject implements Serializable {
     @ApiModelProperty(value = "修改时间")
     private Date updateTime;
 
+    @ApiModelProperty(value = "项目成员")
+    @TableField(exist = false)
+    private Set<TowerProjectUser> users;
+
     @ApiModelProperty(value = "合同预定设备清单")
     @TableField(exist = false)
     private Set<TowerProjectOrder> orders;
 
-    @ApiModelProperty(value = "检查/保养部位配置")
+    @ApiModelProperty(value = "检查部位配置")
     @TableField(exist = false)
-    private Set<TowerProjectPlace> places;
+    private Set<TowerProjectPlace> places1;
+
+    @ApiModelProperty(value = "保养部位配置")
+    @TableField(exist = false)
+    private Set<TowerProjectPlace> places2;
 
 }

src/main/java/com/gxwebsoft/tower/entity/TowerProjectUser.java

@@ -65,4 +65,8 @@ public class TowerProjectUser implements Serializable {
     @TableField(exist = false)
     private String avatar;
 
+    @ApiModelProperty(value = "所在部门")
+    @TableField(exist = false)
+    private String organizationName;
+
 }