标签修改

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/entity/OnlCgformTag.java

@@ -86,10 +86,10 @@ public class OnlCgformTag implements Serializable {
     @ApiModelProperty(value = "字段英文名称描述")
     private java.lang.String dbFieldEnName;
 
-    /**表单控件类型*/
-    @Excel(name = "表单控件类型", width = 15,dicCode ="field_show_type")
+    /**属性类型*/
+    @Excel(name = "属性类型", width = 15,dicCode ="field_show_type")
     @Dict(dicCode ="field_show_type")
-    @ApiModelProperty(value = "表单控件类型")
+    @ApiModelProperty(value = "属性类型")
     private java.lang.String fieldShowType;
 
     @TableField(exist = false)

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/mapper/OnlCgformTagMapper.java

@@ -27,6 +27,7 @@ public interface OnlCgformTagMapper extends BaseMapper<OnlCgformTag> {
             "left join sys_dict_item as i on f.field_show_type=i.item_value\n" +
             "left join onl_cgform_area as a on f.show_area=a.id\n" +
             "where f.cgform_head_id=\"48308196e7b04761b533dc31bc899707\"\n" +
+            "and f.is_delete=0\n" +
             "and i.dict_id=1493098515761917954 \n" +
             "order by f.create_time desc ")
     IPage<OnlCgformTag> queryPageList(IPage page,@Param("params") Map<String,Object> params);