Merge remote-tracking branch 'origin/test' into test

huanghongfa

2021-09-06 7dabeb7cc697537a0be804064688f307fde7fe4d

Merge remote-tracking branch 'origin/test' into test

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActWorkGuideClassifyVO.java

@@ -27,6 +27,9 @@
    @ApiModelProperty("分类名称")
    private String classifyName;

    @ApiModelProperty("图标地址")
    private String pictureUrl;

    @ApiModelProperty("创建时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date createAt;

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActWorkGuideClassifyDO.java

@@ -33,6 +33,11 @@
    private String classifyName;

    /**
     * 图标地址
     */
    private String pictureUrl;

    /**
    * 创建时间
    */
    @TableField(fill = FieldFill.INSERT)
@@ -42,14 +47,4 @@
    * 系统预置：1-是 0-否
    */
    private Integer sysFlag;

@Override
public String toString() {
        return "ComActWorkGuideClassifyDO{" +
                "id=" + id +
                ", classifyName=" + classifyName +
                ", createAt=" + createAt +
                ", sysFlag=" + sysFlag +
        "}";
        }
}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActWorkGuideClassifyMapper.xml

@@ -6,19 +6,21 @@
    <resultMap id="BaseResultMap" type="com.panzhihua.service_community.model.dos.ComActWorkGuideClassifyDO">
                <id column="id" property="id" />
                <result column="classify_name" property="classifyName" />
                <result column="picture_url" property="pictureUrl" />
                <result column="create_at" property="createAt" />
                <result column="sys_flag" property="sysFlag" />
    </resultMap>

    <!-- 通用查询结果列 -->
        <sql id="Base_Column_List">
        id, classify_name, create_at, sys_flag
        id, classify_name, picture_url, create_at, sys_flag
    </sql>

    <select id="pageWorkGuideClassify" resultType="com.panzhihua.common.model.vos.community.ComActWorkGuideClassifyVO">
        select
        id,
        classify_name,
        picture_url,
        create_at,
        sys_flag
        from com_act_work_guide_classify