Merge remote-tracking branch 'origin/develop' into develop

yifu-upms/yifu-upms-api/src/main/java/com/yifu.cloud.plus.v1/yifu/admin/api/entity/SysDict.java

@@ -44,15 +44,15 @@ public class SysDict extends BaseEntity {
 	private Long id;
 
 	/**
-	 * 类型
+	 * 字典编码
 	 */
-	@Schema(description = "字典类型")
+	@Schema(description = "字典编码")
 	private String type;
 
 	/**
-	 * 描述
+	 * 字典名称
 	 */
-	@Schema(description = "字典描述")
+	@Schema(description = "字典名称")
 	private String description;
 
 	/**
@@ -74,4 +74,10 @@ public class SysDict extends BaseEntity {
 	@Schema(description = "删除标记,1:已删除,0:正常")
 	private String delFlag;
 
+
+	/**
+	 * 备注信息
+	 */
+	@Schema(description = "联动上级类型")
+	private String parentItemType;
 }