Merge remote-tracking branch 'origin/dev-ltx' into dev/3.1_release_merge

# Conflicts:
#	src/main/java/com/ai/da/service/WorkspaceService.java
#	src/main/java/com/ai/da/service/impl/DesignServiceImpl.java
#	src/main/java/com/ai/da/service/impl/WorkspaceServiceImpl.java

src/main/java/com/ai/da/mapper/primary/entity/CollectionElement.java

@@ -52,6 +52,12 @@ public class CollectionElement implements Serializable {
      */
     private String level2Type;
 
+    /**
+     * 三级类型 目前只为线稿标注性别
+     */
+    @TableField("level3_type")
+    private String level3Type;
+
     /**
      * 元素名(如果是颜色board 存潘通id+潘通名字 形式 ""11_mds")
      */