Merge remote-tracking branch 'origin/master'

+package com.fedex.connect.common.dao.base;
+
+import com.fedex.connect.common.model.base.DictionaryEntries;
+import com.fedex.connect.common.model.base.DictionaryEntriesExample;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+public interface DictionaryEntriesMapper {
+    long countByExample(DictionaryEntriesExample example);
+
+    int deleteByExample(DictionaryEntriesExample example);
+
+    int deleteByPrimaryKey(Long id);
+
+    int insert(DictionaryEntries record);
+
+    int insertSelective(DictionaryEntries record);
+
+    List<DictionaryEntries> selectByExample(DictionaryEntriesExample example);
+
+    DictionaryEntries selectByPrimaryKey(Long id);
+
+    int updateByExampleSelective(@Param("record") DictionaryEntries record, @Param("example") DictionaryEntriesExample example);
+
+    int updateByExample(@Param("record") DictionaryEntries record, @Param("example") DictionaryEntriesExample example);
+
+    int updateByPrimaryKeySelective(DictionaryEntries record);
+
+    int updateByPrimaryKey(DictionaryEntries record);
+}
\ No newline at end of file

+package com.fedex.connect.common.dao.base;
+
+import com.fedex.connect.common.model.base.Dictionary;
+import com.fedex.connect.common.model.base.DictionaryExample;
+import java.util.List;
+import org.apache.ibatis.annotations.Param;
+
+public interface DictionaryMapper {
+    long countByExample(DictionaryExample example);
+
+    int deleteByExample(DictionaryExample example);
+
+    int deleteByPrimaryKey(Long id);
+
+    int insert(Dictionary record);
+
+    int insertSelective(Dictionary record);
+
+    List<Dictionary> selectByExample(DictionaryExample example);
+
+    Dictionary selectByPrimaryKey(Long id);
+
+    int updateByExampleSelective(@Param("record") Dictionary record, @Param("example") DictionaryExample example);
+
+    int updateByExample(@Param("record") Dictionary record, @Param("example") DictionaryExample example);
+
+    int updateByPrimaryKeySelective(Dictionary record);
+
+    int updateByPrimaryKey(Dictionary record);
+}
\ No newline at end of file

+package com.fedex.connect.common.model.base;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * DESC: 字典目录表
+ * TABLE: T_BI_DICTIONARY
+ */
+public class Dictionary implements Serializable {
+    /**
+     * ID,主键自增
+     */
+    private Long id;
+
+    /**
+     * 字典编号
+     */
+    private String code;
+
+    /**
+     * 字典英文名称
+     */
+    private String englishName;
+
+    /**
+     * 描述
+     */
+    private String description;
+
+    /**
+     * 状态(0：无效、1：有效)
+     */
+    private Long status;
+
+    /**
+     * 上级字典ID
+     */
+    private String parentId;
+
+    /**
+     * 扩展字段1，字符串
+     */
+    private String ext1;
+
+    /**
+     * 扩展字段2，字符串
+     */
+    private String ext2;
+
+    /**
+     * 扩展字段3，数字
+     */
+    private Long ext3;
+
+    /**
+     * 扩展字段4，数字
+     */
+    private Long ext4;
+
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+
+    /**
+     * 创建人ID，关联用户表ID
+     */
+    private Long createUserId;
+
+    /**
+     * 创建人名称
+     */
+    private String createUserName;
+
+    /**
+     * 修改时间
+     */
+    private Date modifyTime;
+
+    /**
+     * 修改人ID，关联用户表ID
+     */
+    private Long modifyUserId;
+
+    /**
+     * 修改人名称
+     */
+    private String modifyUserName;
+
+    private static final long serialVersionUID = 1L;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getCode() {
+        return code;
+    }
+
+    public void setCode(String code) {
+        this.code = code == null ? null : code.trim();
+    }
+
+    public String getEnglishName() {
+        return englishName;
+    }
+
+    public void setEnglishName(String englishName) {
+        this.englishName = englishName == null ? null : englishName.trim();
+    }
+
+    public String getDescription() {
+        return description;
+    }
+
+    public void setDescription(String description) {
+        this.description = description == null ? null : description.trim();
+    }
+
+    public Long getStatus() {
+        return status;
+    }
+
+    public void setStatus(Long status) {
+        this.status = status;
+    }
+
+    public String getParentId() {
+        return parentId;
+    }
+
+    public void setParentId(String parentId) {
+        this.parentId = parentId == null ? null : parentId.trim();
+    }
+
+    public String getExt1() {
+        return ext1;
+    }
+
+    public void setExt1(String ext1) {
+        this.ext1 = ext1 == null ? null : ext1.trim();
+    }
+
+    public String getExt2() {
+        return ext2;
+    }
+
+    public void setExt2(String ext2) {
+        this.ext2 = ext2 == null ? null : ext2.trim();
+    }
+
+    public Long getExt3() {
+        return ext3;
+    }
+
+    public void setExt3(Long ext3) {
+        this.ext3 = ext3;
+    }
+
+    public Long getExt4() {
+        return ext4;
+    }
+
+    public void setExt4(Long ext4) {
+        this.ext4 = ext4;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public Long getCreateUserId() {
+        return createUserId;
+    }
+
+    public void setCreateUserId(Long createUserId) {
+        this.createUserId = createUserId;
+    }
+
+    public String getCreateUserName() {
+        return createUserName;
+    }
+
+    public void setCreateUserName(String createUserName) {
+        this.createUserName = createUserName == null ? null : createUserName.trim();
+    }
+
+    public Date getModifyTime() {
+        return modifyTime;
+    }
+
+    public void setModifyTime(Date modifyTime) {
+        this.modifyTime = modifyTime;
+    }
+
+    public Long getModifyUserId() {
+        return modifyUserId;
+    }
+
+    public void setModifyUserId(Long modifyUserId) {
+        this.modifyUserId = modifyUserId;
+    }
+
+    public String getModifyUserName() {
+        return modifyUserName;
+    }
+
+    public void setModifyUserName(String modifyUserName) {
+        this.modifyUserName = modifyUserName == null ? null : modifyUserName.trim();
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append(getClass().getSimpleName());
+        sb.append(" [");
+        sb.append("Hash = ").append(hashCode());
+        sb.append(", id=").append(id);
+        sb.append(", code=").append(code);
+        sb.append(", englishName=").append(englishName);
+        sb.append(", description=").append(description);
+        sb.append(", status=").append(status);
+        sb.append(", parentId=").append(parentId);
+        sb.append(", ext1=").append(ext1);
+        sb.append(", ext2=").append(ext2);
+        sb.append(", ext3=").append(ext3);
+        sb.append(", ext4=").append(ext4);
+        sb.append(", createTime=").append(createTime);
+        sb.append(", createUserId=").append(createUserId);
+        sb.append(", createUserName=").append(createUserName);
+        sb.append(", modifyTime=").append(modifyTime);
+        sb.append(", modifyUserId=").append(modifyUserId);
+        sb.append(", modifyUserName=").append(modifyUserName);
+        sb.append(", serialVersionUID=").append(serialVersionUID);
+        sb.append("]");
+        return sb.toString();
+    }
+}
\ No newline at end of file

+package com.fedex.connect.common.model.base;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * DESC: 字典表
+ * TABLE: T_BI_DICTIONARY_ENTRIES
+ */
+public class DictionaryEntries implements Serializable {
+    /**
+     * ID,主键自增
+     */
+    private Long id;
+
+    /**
+     * 字典编号
+     */
+    private String code;
+
+    /**
+     * 字典英文名称
+     */
+    private String englishName;
+
+    /**
+     * 描述
+     */
+    private String description;
+
+    /**
+     * 状态(0：无效、1：有效)
+     */
+    private Long status;
+
+    /**
+     * 上级字典ID
+     */
+    private Long parentId;
+
+    /**
+     * 字典目录ID
+     */
+    private Long dictId;
+
+    /**
+     * 字典目录CODE
+     */
+    private String dictCode;
+
+    /**
+     * 字典排序字段
+     */
+    private Long ordinal;
+
+    /**
+     * 扩展字段1，字符串
+     */
+    private String ext1;
+
+    /**
+     * 扩展字段2，字符串
+     */
+    private String ext2;
+
+    /**
+     * 扩展字段3，数字
+     */
+    private Long ext3;
+
+    /**
+     * 扩展字段4，数字
+     */
+    private Long ext4;
+
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+
+    /**
+     * 创建人ID，关联用户表ID
+     */
+    private Long createUserId;
+
+    /**
+     * 创建人名称
+     */
+    private String createUserName;
+
+    /**
+     * 修改时间
+     */
+    private Date modifyTime;
+
+    /**
+     * 修改人ID，关联用户表ID
+     */
+    private Long modifyUserId;
+
+    /**
+     * 修改人名称
+     */
+    private String modifyUserName;
+
+    private static final long serialVersionUID = 1L;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getCode() {
+        return code;
+    }
+
+    public void setCode(String code) {
+        this.code = code == null ? null : code.trim();
+    }
+
+    public String getEnglishName() {
+        return englishName;
+    }
+
+    public void setEnglishName(String englishName) {
+        this.englishName = englishName == null ? null : englishName.trim();
+    }
+
+    public String getDescription() {
+        return description;
+    }
+
+    public void setDescription(String description) {
+        this.description = description == null ? null : description.trim();
+    }
+
+    public Long getStatus() {
+        return status;
+    }
+
+    public void setStatus(Long status) {
+        this.status = status;
+    }
+
+    public Long getParentId() {
+        return parentId;
+    }
+
+    public void setParentId(Long parentId) {
+        this.parentId = parentId;
+    }
+
+    public Long getDictId() {
+        return dictId;
+    }
+
+    public void setDictId(Long dictId) {
+        this.dictId = dictId;
+    }
+
+    public String getDictCode() {
+        return dictCode;
+    }
+
+    public void setDictCode(String dictCode) {
+        this.dictCode = dictCode == null ? null : dictCode.trim();
+    }
+
+    public Long getOrdinal() {
+        return ordinal;
+    }
+
+    public void setOrdinal(Long ordinal) {
+        this.ordinal = ordinal;
+    }
+
+    public String getExt1() {
+        return ext1;
+    }
+
+    public void setExt1(String ext1) {
+        this.ext1 = ext1 == null ? null : ext1.trim();
+    }
+
+    public String getExt2() {
+        return ext2;
+    }
+
+    public void setExt2(String ext2) {
+        this.ext2 = ext2 == null ? null : ext2.trim();
+    }
+
+    public Long getExt3() {
+        return ext3;
+    }
+
+    public void setExt3(Long ext3) {
+        this.ext3 = ext3;
+    }
+
+    public Long getExt4() {
+        return ext4;
+    }
+
+    public void setExt4(Long ext4) {
+        this.ext4 = ext4;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public Long getCreateUserId() {
+        return createUserId;
+    }
+
+    public void setCreateUserId(Long createUserId) {
+        this.createUserId = createUserId;
+    }
+
+    public String getCreateUserName() {
+        return createUserName;
+    }
+
+    public void setCreateUserName(String createUserName) {
+        this.createUserName = createUserName == null ? null : createUserName.trim();
+    }
+
+    public Date getModifyTime() {
+        return modifyTime;
+    }
+
+    public void setModifyTime(Date modifyTime) {
+        this.modifyTime = modifyTime;
+    }
+
+    public Long getModifyUserId() {
+        return modifyUserId;
+    }
+
+    public void setModifyUserId(Long modifyUserId) {
+        this.modifyUserId = modifyUserId;
+    }
+
+    public String getModifyUserName() {
+        return modifyUserName;
+    }
+
+    public void setModifyUserName(String modifyUserName) {
+        this.modifyUserName = modifyUserName == null ? null : modifyUserName.trim();
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append(getClass().getSimpleName());
+        sb.append(" [");
+        sb.append("Hash = ").append(hashCode());
+        sb.append(", id=").append(id);
+        sb.append(", code=").append(code);
+        sb.append(", englishName=").append(englishName);
+        sb.append(", description=").append(description);
+        sb.append(", status=").append(status);
+        sb.append(", parentId=").append(parentId);
+        sb.append(", dictId=").append(dictId);
+        sb.append(", dictCode=").append(dictCode);
+        sb.append(", ordinal=").append(ordinal);
+        sb.append(", ext1=").append(ext1);
+        sb.append(", ext2=").append(ext2);
+        sb.append(", ext3=").append(ext3);
+        sb.append(", ext4=").append(ext4);
+        sb.append(", createTime=").append(createTime);
+        sb.append(", createUserId=").append(createUserId);
+        sb.append(", createUserName=").append(createUserName);
+        sb.append(", modifyTime=").append(modifyTime);
+        sb.append(", modifyUserId=").append(modifyUserId);
+        sb.append(", modifyUserName=").append(modifyUserName);
+        sb.append(", serialVersionUID=").append(serialVersionUID);
+        sb.append("]");
+        return sb.toString();
+    }
+}
\ No newline at end of file