Merge remote-tracking branch 'origin/developer' into developerB

# Conflicts:
#	src/main/resources/mapper/ArticleMapper.xml

src/main/resources/mapper/ArticleMapper.xml

@@ -59,14 +59,12 @@
         where id = #{articleId}
     </update>
     <delete id="deleteArticleByArticleId">
-        delete
-        from cm_brand_article
-        where id = #{articleId}
+        delete from cm_brand_article where id = #{articleId}
     </delete>
     <select id="getArticleList" resultType="com.caimei.model.vo.ArticleListVo">
         select a.id as articleId,a.title as articleTitle,a.image as articleImage,
         a.auditStatus,a.invalidReason,a.status,a.createTime,
-        au.name as auditBy,a.auditTime, a.checkFlag
+        au.name as auditBy,a.auditTime
         from cm_brand_article a
         left join cm_brand_auth_user au on a.auditBy = au.authUserId
         where a.authUserId = #{authUserId}

src/main/resources/mapper/ImageMapper.xml

@@ -2,8 +2,8 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.caimei.mapper.cmMapper.ImageMapper">
     <insert id="insertImage" keyColumn="id" keyProperty="id" parameterType="com.caimei.model.po.ImagePo" useGeneratedKeys="true">
-        insert into cm_brand_image(authUserId, title, zipUrl, auditStatus, status, createTime, auditBy, auditTime, checkFlag)
-        values (#{authUserId}, #{title}, #{zipUrl}, #{auditStatus}, #{status}, #{createTime}, #{auditBy}, #{auditTime}, #{checkFlag})
+        insert into cm_brand_image(authUserId, title, zipUrl, auditStatus, status, createTime, auditBy, auditTime)
+        values (#{authUserId}, #{title}, #{zipUrl}, #{auditStatus}, #{status}, #{createTime}, #{auditBy}, #{auditTime})
     </insert>
     <insert id="insertImageDetail">
         insert into cm_brand_image_detail(imageId, image)
@@ -14,8 +14,7 @@
         set title       = #{title},
             zipUrl      = #{zipUrl},
             status      = #{status},
-            auditStatus = #{auditStatus},
-            checkFlag   = #{checkFlag}
+            auditStatus = #{auditStatus}
         where id = #{id}
     </update>
     <update id="updateImageStatusByImageId">
@@ -46,7 +45,7 @@
     <select id="getImageList" resultType="com.caimei.model.vo.ImageListVo">
         select a.id as imageId,a.title as imageTitle,
         a.auditStatus,a.invalidReason,a.status,a.createTime,
-        au.name as auditBy,a.auditTime,a.checkFlag
+        au.name as auditBy,a.auditTime
         from cm_brand_image a
         left join cm_brand_auth_user au on a.auditBy = au.authUserId
         where a.authUserId = #{authUserId}

src/main/resources/mapper/VideoMapper.xml

@@ -3,9 +3,9 @@
 <mapper namespace="com.caimei.mapper.cmMapper.VideoMapper">
     <insert id="insertVideo" keyColumn="id" keyProperty="id" parameterType="com.caimei.model.po.VideoPo" useGeneratedKeys="true">
         insert into cm_brand_video(authUserId, title, image, name, previewUrl, downloadUrl, auditStatus, status, createTime,
-                                   auditBy, auditTime, checkFlag)
+                                   auditBy, auditTime)
         values (#{authUserId}, #{title}, #{image}, #{name}, #{previewUrl}, #{downloadUrl}, #{auditStatus}, #{status},
-                #{createTime}, #{auditBy}, #{auditTime}, #{checkFlag})
+                #{createTime}, #{auditBy}, #{auditTime})
     </insert>
     <update id="updateVideoByVideoId">
         update cm_brand_video
@@ -52,9 +52,6 @@
             <if test="auditStatus != null">
                 auditStatus = #{auditStatus},
             </if>
-            <if test="checkFlag != null">
-                checkFlag = #{checkFlag},
-            </if>
         </set>
         where id = #{id}
     </update>
@@ -67,7 +64,7 @@
     <select id="getVideoList" resultType="com.caimei.model.vo.VideoListVo">
         select a.id as videoId,a.title as videoTitle,a.image as videoImage, a.name as videoName, a.previewUrl as videoPreviewUrl, a.downloadUrl
         as videoDownloadUrl,a.auditStatus,a.invalidReason,a.status,a.createTime,
-        au.name as auditBy,a.auditTime,a.checkFlag
+        au.name as auditBy,a.auditTime
         from cm_brand_video a
         left join cm_brand_auth_user au on a.auditBy = au.authUserId
         where a.authUserId = #{authUserId}