提交 a9d1d8ab 编写于 作者: ibizdev's avatar ibizdev

ibizdev提交

上级 21b8444e
......@@ -39,14 +39,14 @@ public class IBZDict implements Serializable {
@DEField(isKeyField=true)
@JSONField(name = "dictid")
@JsonProperty("dictid")
private String dictId;
private String dictid;
/**
* 字典名称
*/
@JSONField(name = "dictname")
@JsonProperty("dictname")
private String dictName;
private String dictname;
/**
* 逻辑有效标志
......@@ -63,7 +63,7 @@ public class IBZDict implements Serializable {
@JsonFormat(pattern="yyyy-MM-dd HH:mm:ss", locale = "zh" , timezone="GMT+8")
@JSONField(name = "createdate" , format="yyyy-MM-dd HH:mm:ss")
@JsonProperty("createdate")
private Timestamp createDate;
private Timestamp createdate;
/**
* 更新时间
......@@ -72,7 +72,7 @@ public class IBZDict implements Serializable {
@JsonFormat(pattern="yyyy-MM-dd HH:mm:ss", locale = "zh" , timezone="GMT+8")
@JSONField(name = "updatedate" , format="yyyy-MM-dd HH:mm:ss")
@JsonProperty("updatedate")
private Timestamp updateDate;
private Timestamp updatedate;
/**
* 建立人
......@@ -80,7 +80,7 @@ public class IBZDict implements Serializable {
@DEField(preType = DEPredefinedFieldType.CREATEMAN)
@JSONField(name = "createman")
@JsonProperty("createman")
private String createMan;
private String createman;
/**
* 更新人
......@@ -88,7 +88,7 @@ public class IBZDict implements Serializable {
@DEField(preType = DEPredefinedFieldType.UPDATEMAN)
@JSONField(name = "updateman")
@JsonProperty("updateman")
private String updateMan;
private String updateman;
......
......@@ -31,42 +31,42 @@ public class IBZDictItem implements Serializable {
@DEField(isKeyField=true)
@JSONField(name = "itemid")
@JsonProperty("itemid")
private String itemId;
private String itemid;
/**
* 栏目显示值
*/
@JSONField(name = "itemname")
@JsonProperty("itemname")
private String itemName;
private String itemname;
/**
* 栏目值
*/
@JSONField(name = "itemval")
@JsonProperty("itemval")
private String itemVal;
private String itemval;
/**
* 字典标识
*/
@JSONField(name = "dictid")
@JsonProperty("dictid")
private String dictId;
private String dictid;
/**
* 父栏目值
*/
@JSONField(name = "pitemval")
@JsonProperty("pitemval")
private String pItemVal;
private String pitemval;
/**
* 过滤项
*/
@JSONField(name = "itemfilter")
@JsonProperty("itemfilter")
private String itemFilter;
private String itemfilter;
/**
* 栏目样式
......@@ -74,7 +74,7 @@ public class IBZDictItem implements Serializable {
@DEField(defaultValue = "itemcls" , defaultValueType = DEFieldDefaultValueType.PARAM)
@JSONField(name = "itemcls")
@JsonProperty("itemcls")
private String itemCls;
private String itemcls;
/**
* 图标
......@@ -82,14 +82,14 @@ public class IBZDictItem implements Serializable {
@DEField(defaultValue = "no,png")
@JSONField(name = "itemicon")
@JsonProperty("itemicon")
private String itemIcon;
private String itemicon;
/**
* 排序
*/
@JSONField(name = "showorder")
@JsonProperty("showorder")
private Integer showOrder;
private Integer showorder;
/**
* 建立时间
......@@ -98,7 +98,7 @@ public class IBZDictItem implements Serializable {
@JsonFormat(pattern="yyyy-MM-dd HH:mm:ss", locale = "zh" , timezone="GMT+8")
@JSONField(name = "createdate" , format="yyyy-MM-dd HH:mm:ss")
@JsonProperty("createdate")
private Timestamp createDate;
private Timestamp createdate;
/**
* 更新时间
......@@ -107,7 +107,7 @@ public class IBZDictItem implements Serializable {
@JsonFormat(pattern="yyyy-MM-dd HH:mm:ss", locale = "zh" , timezone="GMT+8")
@JSONField(name = "updatedate" , format="yyyy-MM-dd HH:mm:ss")
@JsonProperty("updatedate")
private Timestamp updateDate;
private Timestamp updatedate;
/**
* 建立人
......@@ -115,7 +115,7 @@ public class IBZDictItem implements Serializable {
@DEField(preType = DEPredefinedFieldType.CREATEMAN)
@JSONField(name = "createman")
@JsonProperty("createman")
private String createMan;
private String createman;
/**
* 更新人
......@@ -123,7 +123,7 @@ public class IBZDictItem implements Serializable {
@DEField(defaultValue = "SRFPERSONID" , defaultValueType = DEFieldDefaultValueType.SESSION , preType = DEPredefinedFieldType.UPDATEMAN)
@JSONField(name = "updateman")
@JsonProperty("updateman")
private String updateMan;
private String updateman;
/**
......
......@@ -18,6 +18,7 @@ import org.springframework.data.domain.Page;
import org.springframework.data.domain.PageImpl;
import org.springframework.data.domain.Pageable;
import org.springframework.util.ObjectUtils;
import org.springframework.transaction.annotation.Transactional;
import cn.ibizlab.core.dict.domain.IBZDict;
import cn.ibizlab.core.dict.filter.IBZDictSearchContext;
import cn.ibizlab.core.dict.service.IIBZDictService;
......
Markdown 格式
0% or
您添加了 0 到此讨论。请谨慎行事。
先完成此消息的编辑!
想要评论请 注册