Merge remote-tracking branch 'origin/master'

dangan-common/src/main/java/com/da/common/core/domain/TreeSelect.java

@@ -28,9 +28,12 @@ public class TreeSelect implements Serializable
     /** 业务类型 */
     private String ywType;
 
-    /** 业务类型 */
+    /** 内容 */
     private String content;
 
+    /** 根据客户需求  由于数据库已有很多数据 此处使用remark存储图片 */
+    private String remark;
+
     /** 子节点 */
     @JsonInclude(JsonInclude.Include.NON_EMPTY)
     private List<TreeSelect> children;
@@ -67,9 +70,18 @@ public class TreeSelect implements Serializable
         this.id = cabinet.getId();
         this.label = cabinet.getPosName();
         this.content=cabinet.getContent();
+        this.remark=cabinet.getRemark();
         this.children = cabinet.getChildren().stream().map(TreeSelect::new).collect(Collectors.toList());
     }
 
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+
     public String getContent() {
         return content;
     }