标签管理-标签内容

jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/entity/SysCategory.java

@@ -26,44 +26,75 @@ public class SysCategory implements Serializable,Comparable<SysCategory>{
 	/**主键*/
 	@TableId(type = IdType.ASSIGN_ID)
 	private java.lang.String id;
+
 	/**父级节点*/
 	private java.lang.String pid;
+
 	/**类型名称*/
 	@Excel(name = "类型名称", width = 15)
 	private java.lang.String name;
+
 	/**类型编码*/
 	@Excel(name = "类型编码", width = 15)
 	private java.lang.String code;
+
 	/**创建人*/
 	private java.lang.String createBy;
+
 	/**创建日期*/
 	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
 	private java.util.Date createTime;
+
 	/**更新人*/
 	private java.lang.String updateBy;
+
 	/**更新日期*/
 	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
 	private java.util.Date updateTime;
+
 	/**所属部门*/
 	private java.lang.String sysOrgCode;
+
+	/**数据字典id*/
+	@Excel(name = "数据字典id", width = 15)
+	@Dict(dictTable = "sys_dict", dicText = "id", dicCode = "id")
+	@ApiModelProperty(value = "是否为标签内容-数据字典（1是 0否）")
+	private java.lang.Integer sysDictId;
+
 	/**是否有子节点*/
 	@Excel(name = "是否有子节点(1:有)", width = 15)
 	private java.lang.String hasChild;
+
 	/**英文名称*/
 	@Excel(name = "英文名称", width = 15)
 	private java.lang.String enName;
+
 	/**描述*/
 	@Excel(name = "描述", width = 15)
 	private java.lang.String description;
-	/**
-	 * 是否为标签内容-数据字典（1是 0否）
-	 */
+
+	/**是否为标签内容-数据字典（1是 0否）*/
 	@Excel(name = "是否为标签内容-数据字典（1是 0否）", width = 15)
 	@Dict(dictTable = "onl_cgform_field", dicText = "is_tag_dict", dicCode = "is_tag_dict")
 	@ApiModelProperty(value = "是否为标签内容-数据字典（1是 0否）")
 	private java.lang.Integer isTagDict;
+
+	/**是否是只读（2字段固定，内部可配1固定字段 0非固定字段）*/
+	@Excel(name = "是否是只读（2字段固定，内部可配1固定字段 0非固定字段）", width = 15, dictTable = "onl_cgform_field", dicText = "is_read_only", dicCode = "is_read_only")
+	@Dict(dictTable = "onl_cgform_field", dicText = "is_read_only", dicCode = "is_read_only")
+	@ApiModelProperty(value = "是否是只读（2字段固定，内部可配1固定字段 0非固定字段）")
+	private java.lang.Integer isReadOnly;
+
+	/**
+	 * 表单控件类型
+	 */
+	@Excel(name = "标签类型 1下拉选择 2树形结构", width = 15)
+	@ApiModelProperty(value = "标签类型 1下拉选择 2树形结构")
+	@Dict(dicCode = "attribute_type")
+	private java.lang.String attributeType;
+
 	@Override
 	public int compareTo(SysCategory o) {
 		//比较条件我们定的是按照code的长度升序

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/collection/entity/OnlCgformCollection.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.jero.common.aspect.annotation.Dict;
+import com.jero.modules.document.entity.BussDocumentLibraryEO;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.*;
@@ -13,6 +14,7 @@ import org.jeecgframework.poi.excel.annotation.Excel;
 import org.springframework.format.annotation.DateTimeFormat;
 
 import java.io.Serializable;
+import java.util.Date;
 
 
 /**
@@ -26,7 +28,7 @@ import java.io.Serializable;
 @Accessors(chain = true)
 @EqualsAndHashCode(callSuper = false)
 @ApiModel(value="onl_cgform_collection对象", description="我的收藏")
-public class OnlCgformCollection implements Serializable {
+public class OnlCgformCollection extends BussDocumentLibraryEO implements Serializable {
     private static final long serialVersionUID = 1L;
 
 	/**主键*/
@@ -44,24 +46,35 @@ public class OnlCgformCollection implements Serializable {
     @ApiModelProperty(value = "收藏日期")
     private java.util.Date createTime;
 
+    /** 更新人*/
+    private String updateBy;
+
+    /**更新时间*/
+    private Date updateTime;
+
 	/**所属部门*/
     @ApiModelProperty(value = "所属部门")
     private String sysOrgCode;
 
-	/**状态*/
-    @Excel(name = "状态", width = 15, dictTable = "buss_document_library", dicText = "state", dicCode = "state")
-    @Dict(dictTable = "buss_document_library", dicText = "state", dicCode = "state")
-    private String state;
+    /**文档库id*/
+    @Excel(name = "文档库id", width = 15, dictTable = "buss_document_library", dicText = "id", dicCode = "id")
+    @Dict(dictTable = "buss_document_library", dicText = "id", dicCode = "id")
+    private String documentId;
 
-	/**编号*/
-    @Excel(name = "编号", width = 15, dictTable = "buss_document_library", dicText = "serialNumber", dicCode = "serialNumber")
-    @Dict(dictTable = "buss_document_library", dicText = "serialNumber", dicCode = "serialNumber")
-    private String serialNumber;
-
-	/**标题*/
-    @Excel(name = "标题", width = 15, dictTable = "buss_document_library", dicText = "title", dicCode = "title")
-    @Dict(dictTable = "buss_document_library", dicText = "title", dicCode = "title")
-    @ApiModelProperty(value = "标题")
-    private String title;
+//	/**状态*/
+//    @Excel(name = "状态", width = 15, dictTable = "buss_document_library", dicText = "state", dicCode = "state")
+//    @Dict(dictTable = "buss_document_library", dicText = "state", dicCode = "state")
+//    private String state;
+//
+//	/**编号*/
+//    @Excel(name = "编号", width = 15, dictTable = "buss_document_library", dicText = "serial_number", dicCode = "serial_number")
+//    @Dict(dictTable = "buss_document_library", dicText = "serial_number", dicCode = "serial_number")
+//    private String serialNumber;
+//
+//	/**标题*/
+//    @Excel(name = "标题", width = 15, dictTable = "buss_document_library", dicText = "title", dicCode = "title")
+//    @Dict(dictTable = "buss_document_library", dicText = "title", dicCode = "title")
+//    @ApiModelProperty(value = "标题")
+//    private String title;
 
 }