Merge remote-tracking branch 'origin/20210204' into 20210223

smart-city-platform/src/main/resources/mapper/UserMapper.xml

@@ -354,7 +354,7 @@
                 <if test="user.createBy != null"> create_by = #{user.createBy,jdbcType=VARCHAR},</if>
                 <if test="user.updateDate != null"> update_date = #{user.updateDate,jdbcType=TIMESTAMP},</if>
                 <if test="user.updateBy != null"> update_by = #{user.updateBy,jdbcType=VARCHAR},</if>
-                <if test="user.openid != null"> openid = #{user.openid,jdbcType=VARCHAR}</if>
+                <if test="user.openid != null"> openid = #{user.openid,jdbcType=VARCHAR},</if>
                 <if test="user.uniqid != null"> uniq_id = #{user.uniqid,jdbcType=VARCHAR}</if>
         </set>
 		WHERE id = #{user.id,jdbcType=INTEGER}