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

byit-myth-core/myth-admin-core/src/main/resources/mapper/WorkspaceMapper.xml

@@ -26,7 +26,7 @@
     select
     <include refid="Base_Column_List" />
     from workspace
-    where workspace_name = #{workspaceName,jdbcType=STRING}
+    where workspace_name = #{workspaceName,jdbcType=VARCHAR}
   </select>
 
   <delete id="deleteById" parameterType="java.lang.Integer">