Merge branch 'dev' of http://www.ekexiu.com:3000/jiapeng/portal-web.git into dev

src/main/java/com/ekexiu/portal/po/DiscoverBanner.java

package com.ekexiu.portal.po;
import com.ekexiu.portal.basepo.CreateTimeSupported;
import com.ekexiu.portal.basepo.ModifyTimeSupported;
import org.jfw.apt.orm.annotation.entry.Column;
import org.jfw.apt.orm.annotation.entry.PrimaryKey;
import org.jfw.apt.orm.annotation.entry.Table;
import org.jfw.apt.orm.core.defaultImpl.LongHandler;
import org.jfw.apt.orm.core.enums.DE;
/**
 * Created by TT on 2017/8/25.
 */
@PrimaryKey("id")
@Table
public class DiscoverBanner implements CreateTimeSupported, ModifyTimeSupported {
    private long id;
    private String title;
    private int banner;
    private String beginTime;
    private String endTime;
    private long pageViews;
    private String descp;
    private String articleId;
    private String modifyTime;
    private String modifier;
    private String createTime;
    private String creator;
    @Column(DE.bigSerial)
    public long getId() {
        return id;
    }
    public void setId(long id) {
        this.id = id;
    }
    @Column(DE.Text_de)
    public String getTitle() {
        return title;
    }
    public void setTitle(String title) {
        this.title = title;
    }
    @Column(DE.int_de)
    public int getBanner() {
        return banner;
    }
    public void setBanner(int banner) {
        this.banner = banner;
    }
    @Column(DE.Text_de)
    public String getBeginTime() {
        return beginTime;
    }
    public void setBeginTime(String beginTime) {
        this.beginTime = beginTime;
    }
    @Column(DE.Text_de)
    public String getEndTime() {
        return endTime;
    }
    public void setEndTime(String endTime) {
        this.endTime = endTime;
    }
    @Column(handlerClass = LongHandler.class, dbType = "BIGINT", fixSqlValueWithInsert = "0", insertable = true, renewable = false, nullable = false, queryable = true)
    public long getPageViews() {
        return pageViews;
    }
    public void setPageViews(long pageViews) {
        this.pageViews = pageViews;
    }
    @Column(DE.Text_de)
    public String getDescp() {
        return descp;
    }
    public void setDescp(String descp) {
        this.descp = descp;
    }
    @Column(DE.Text_de)
    public String getArticleId() {
        return articleId;
    }
    public void setArticleId(String articleId) {
        this.articleId = articleId;
    }
    @Column(DE.Text_de)
    public String getModifier() {
        return modifier;
    }
    public void setModifier(String modifier) {
        this.modifier = modifier;
    }
    @Column(DE.Text_de)
    public String getCreator() {
        return creator;
    }
    public void setCreator(String creator) {
        this.creator = creator;
    }
    @Override
    public String getModifyTime() {
        return this.modifyTime;
    }
    @Override
    public void setModifyTime(String modifyTime) {
        this.modifyTime = modifyTime;
    }
    @Override
    public String getCreateTime() {
        return this.createTime;
    }
    @Override
    public void setCreateTime(String createTime) {
        this.createTime = createTime;
    }
}

src/main/resources/database.sql

ALTER TABLE organization ADD COLUMN col_mgr char(1) NOT NULL DEFAULT '0';
COMMENT ON COLUMN organization.col_mgr IS '是否是管理者 0：不是  1:是';
CREATE TABLE discover_banner (
  id bigserial PRIMARY KEY NOT NULL, -- 编号id
  title CHARACTER VARYING(50) NOT NULL, -- 外显标题
  banner SMALLINT NOT NULL, -- 栏目
  begin_time CHARACTER(14), -- 上架时间
  end_time CHARACTER(14), -- 下架时间
  clicks BIGINT NOT NULL DEFAULT 0, -- 点击量
  descp TEXT, -- 备注
  article_id CHARACTER(32) NOT NULL, -- 文章ID
  modify_time CHARACTER(14) NOT NULL, -- 修改时间
  modifier CHARACTER VARYING(32), -- 最后修改人ID
  create_time CHARACTER(14) NOT NULL, -- 创建时间
  creator CHARACTER VARYING(32) NOT NULL -- 创建人ID
);
COMMENT ON COLUMN discover_banner.id IS '编号id';
COMMENT ON COLUMN discover_banner.title IS '外显标题';
COMMENT ON COLUMN discover_banner.banner IS '栏目';
COMMENT ON COLUMN discover_banner.begin_time IS '上架时间';
COMMENT ON COLUMN discover_banner.end_time IS '下架时间';
COMMENT ON COLUMN discover_banner.clicks IS '点击量';
COMMENT ON COLUMN discover_banner.descp IS '备注';
COMMENT ON COLUMN discover_banner.article_id IS '文章ID';
COMMENT ON COLUMN discover_banner.modify_time IS '修改时间';
COMMENT ON COLUMN discover_banner.modifier IS '最后修改人ID';
COMMENT ON COLUMN discover_banner.create_time IS '创建时间';
COMMENT ON COLUMN discover_banner.creator IS '创建人ID';