diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDictItemController.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDictItemController.java
index 17ae15abb..c48906567 100644
--- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDictItemController.java
+++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDictItemController.java
@@ -1,35 +1,26 @@
 package com.jero.modules.system.controller;
 
 
-import java.util.Arrays;
-import java.util.Date;
-
-import javax.servlet.http.HttpServletRequest;
-
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import io.swagger.annotations.ApiOperation;
-import org.apache.commons.lang.StringUtils;
-import org.apache.shiro.authz.annotation.RequiresPermissions;
-import org.apache.shiro.authz.annotation.RequiresRoles;
-import com.jero.common.api.vo.Result;
-import com.jero.common.constant.CacheConstant;
-import com.jero.common.system.query.QueryGenerator;
-import com.jero.common.util.oConvertUtils;
-import com.jero.modules.system.entity.SysDictItem;
-import com.jero.modules.system.service.ISysDictItemService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.cache.annotation.CacheEvict;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-
+import com.jero.common.api.vo.Result;
+import com.jero.common.constant.CacheConstant;
+import com.jero.common.system.query.QueryGenerator;
+import com.jero.modules.system.entity.SysDictItem;
+import com.jero.modules.system.service.ISysDictItemService;
+import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang.StringUtils;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.cache.annotation.CacheEvict;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.Arrays;
+import java.util.Date;
 
 /**
  * <p>
@@ -61,11 +52,18 @@ public class SysDictItemController {
 									  @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,HttpServletRequest req) {
 		Result<IPage<SysDictItem>> result = new Result<IPage<SysDictItem>>();
 		QueryWrapper<SysDictItem> queryWrapper = QueryGenerator.initQueryWrapper(sysDictItem, req.getParameterMap());
-		queryWrapper.orderByAsc("sort_order");
 		Page<SysDictItem> page = new Page<SysDictItem>(pageNo, pageSize);
-		IPage<SysDictItem> pageList = sysDictItemService.page(page, queryWrapper);
+		if(sysDictItem.getIsTagDict()==0) {
+			queryWrapper.like("is_tag_dict",0).and(wq->wq.orderByAsc("sort_order"));
+			IPage<SysDictItem> pageList = sysDictItemService.page(page, queryWrapper);
+			result.setResult(pageList);
+		}
+		else if(sysDictItem.getIsTagDict()==1) {
+			queryWrapper.like("is_tag_dict",1).and(wq->wq.orderByAsc("sort_order"));
+			IPage<SysDictItem> pageList = sysDictItemService.page(page, queryWrapper);
+			result.setResult(pageList);
+		}
 		result.setSuccess(true);
-		result.setResult(pageList);
 		return result;
 	}
 	
@@ -105,12 +103,16 @@ public class SysDictItemController {
 		if(sysdict==null) {
 			result.error500("未找到对应实体");
 		}else {
-			sysDictItem.setUpdateTime(new Date());
-			boolean ok = sysDictItemService.updateById(sysDictItem);
-			//TODO 返回false说明什么？
-			if(ok) {
-				result.success("编辑成功!");
-			}
+			if(sysDictItem.getIsReadOnly()==2){
+				result.error("固定字段,不可修改");
+			}else if(sysDictItem.getIsReadOnly() == 1 || sysDictItem.getIsReadOnly() == 0){
+				sysDictItem.setUpdateTime(new Date());
+				boolean ok = sysDictItemService.updateById(sysDictItem);
+				//TODO 返回false说明什么？
+				if(ok) {
+					result.success("编辑成功!");
+				}
+			}else result.error("数据isReadOnly状态异常,请检查数据库!");
 		}
 		return result;
 	}
@@ -130,10 +132,15 @@ public class SysDictItemController {
 		if(joinSystem==null) {
 			result.error500("未找到对应实体");
 		}else {
-			boolean ok = sysDictItemService.removeById(id);
-			if(ok) {
-				result.success("删除成功!");
-			}
+			if(joinSystem.getIsReadOnly()==2){
+				result.error("固定字段,不可修改");
+			}else if(joinSystem.getIsReadOnly() == 1 || joinSystem.getIsReadOnly() == 0){
+				boolean ok = sysDictItemService.removeById(id);
+				if(ok) {
+					result.success("删除成功!");
+				}
+			}else result.error("数据isReadOnly状态异常,请检查数据库!");
+
 		}
 		return result;
 	}
@@ -152,8 +159,13 @@ public class SysDictItemController {
 		if(ids==null || "".equals(ids.trim())) {
 			result.error500("参数不识别！");
 		}else {
-			this.sysDictItemService.removeByIds(Arrays.asList(ids.split(",")));
-			result.success("删除成功!");
+			SysDictItem sysDictItem = sysDictItemService.getById(ids);
+			if(sysDictItem.getIsReadOnly() == 1 || sysDictItem.getIsReadOnly()==2){
+				result.error("固定字段,不可删除");
+			}else if(sysDictItem.getIsReadOnly() == 0){
+				this.sysDictItemService.removeByIds(Arrays.asList(ids.split(",")));
+				result.success("批量删除成功!");
+			}else result.error("数据isReadOnly状态异常,请检查数据库!");
 		}
 		return result;
 	}
diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/entity/SysDictItem.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/entity/SysDictItem.java
index 036dd0e18..03de2afa1 100644
--- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/entity/SysDictItem.java
+++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/entity/SysDictItem.java
@@ -1,18 +1,17 @@
 package com.jero.modules.system.entity;
 
-import java.io.Serializable;
-import java.math.BigDecimal;
-import java.util.Date;
-
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
-
+import com.jero.common.aspect.annotation.Dict;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
-import com.jero.common.aspect.annotation.Dict;
 import org.jeecgframework.poi.excel.annotation.Excel;
 
+import java.io.Serializable;
+import java.util.Date;
+
 /**
  * <p>
  *
@@ -78,5 +77,16 @@ public class SysDictItem implements Serializable {
 
     private Date updateTime;
 
+    /**
+     * 是否为标签内容-数据字典（1是 0否）
+     */
+    @Excel(name = "是否为标签内容-数据字典（1是 0否）", width = 15)
+    @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;
 }