Merge branch 'dev_seller_soft_delete' into test6.8.9

@@ -79,7 +79,7 @@
   </delete>
   </delete>
 
 
   <insert id="insertbak" parameterType="com.yohoufo.dal.user.model.ZhiMaCert" >
   <insert id="insertbak" parameterType="com.yohoufo.dal.user.model.ZhiMaCert" >
-    insert into zhima_cert (uid, valid_status, cert_no, cert_name, biz_no,create_time, update_time)
+    insert into zhima_cert_bak (uid, valid_status, cert_no, cert_name, biz_no,create_time, update_time)
     values (#{uid},#{validStatus},
     values (#{uid},#{validStatus},
     #{certNo},#{certName},#{bizNo},
     #{certNo},#{certName},#{bizNo},
     #{createTime},#{updateTime})
     #{createTime},#{updateTime})
@@ -88,7 +88,7 @@
   <select id="selectByUid" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
   <select id="selectByUid" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
     select
     select
     <include refid="Base_Column_List" />
     <include refid="Base_Column_List" />
-    from zhima_cert_bak
+    from zhima_cert
     where  uid = #{uid}
     where  uid = #{uid}
   </select>
   </select>
 </mapper>
 </mapper>