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

ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml

@@ -156,7 +156,7 @@
 			<if test="icon !=null and icon != ''">icon = #{icon},</if>
 			<if test="remark != null and remark != ''">remark = #{remark},</if>
 			<if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
-			<if test="distinguish != null and distinguish != ''">distinguish = #{distinguish},</if>
+			<if test="distinguish != null ">distinguish = #{distinguish},</if>
 			update_time = sysdate()
 		</set>
 		where menu_id = #{menuId}