Merge remote-tracking branch 'origin/main'

This commit is contained in:
gaoqr
2024-06-18 17:56:35 +08:00
20 changed files with 200 additions and 43 deletions
@@ -22,8 +22,8 @@ public class DataSourceRespVO {
@ExcelProperty("数据源名称")
private String name;
@Schema(description = "sql", requiredMode = Schema.RequiredMode.REQUIRED)
@ExcelProperty("sql")
@Schema(description = "sqlStr", requiredMode = Schema.RequiredMode.REQUIRED)
@ExcelProperty("sqlStr")
private String sqlStr;
@Schema(description = "数据源类型", requiredMode = Schema.RequiredMode.REQUIRED, example = "2")
@@ -6,7 +6,7 @@
<result property="name" column="name"/>
<result property="type" column="type"/>
<result property="createTime" column="create_time"/>
<result property="sql" column="sql"/>
<result property="sqlStr" column="sql_str"/>
<collection property="filedList" javaType="java.util.List" ofType="com.cf.imes.module.system.dal.dataobject.datasource.DataSourceFiledDO">
<result property="name" column="field_name"/>
<result property="sourceId" column="field_source_id"/>