Merge remote-tracking branch 'origin/master'

yifu-permission/yifu-permission-api/src/main/java/com/yifu/cloud/plus/v1/yifu/permission/entity/SysMenu.java

@@ -145,4 +145,16 @@ public class SysMenu extends BaseEntity {
 	 */
 	@Schema(description = "是否开关（0开、1关）")
 	private String isOpen;
+
+	/**
+	 * 表名，用来先查结果集
+	 */
+	@Schema(description = "表名，用来先查结果集")
+	private String tableName;
+	/**
+	 * 查询字段维度，如果fdId超长，则使用本字段
+	 */
+	@Schema(description = "查询字段维度，如果fdId超长，则使用本字段")
+	private String queryFields;
+
 }

yifu-permission/yifu-permission-biz/src/main/resources/mapper/SysMenuMapper.xml

@@ -28,6 +28,8 @@
     <result property="createTime" column="CREATE_TIME"/>
     <result property="updateTime" column="UPDATE_TIME"/>
     <result property="isOpen" column="IS_OPEN"/>
+    <result property="tableName" column="TABLE_NAME"/>
+    <result property="queryFields" column="QUERY_FIELDS"/>
   </resultMap>
     <sql id="Base_Column_List">
                 a.ID,
@@ -49,7 +51,9 @@
                 a.DEPT_ID,
                 a.IS_OPEN,
                 a.VIEW_ID,
-                a.CREATE_TIME
+                a.CREATE_TIME,
+				a.TABLE_NAME,
+				a.QUERY_FIELDS
     </sql>
     <sql id="sysMenu_where">
         <if test="sysMenu != null">