diff --git a/sgzb-modules/sgzb-gen/pom.xml b/sgzb-modules/sgzb-gen/pom.xml
index 71676ad6..89ceba04 100644
--- a/sgzb-modules/sgzb-gen/pom.xml
+++ b/sgzb-modules/sgzb-gen/pom.xml
@@ -59,6 +59,18 @@
             <groupId>com.mysql</groupId>
             <artifactId>mysql-connector-j</artifactId>
         </dependency>
+
+        <!-- RuoYi Common DataSource -->
+        <dependency>
+            <groupId>com.bonus.sgzb</groupId>
+            <artifactId>sgzb-common-datasource</artifactId>
+        </dependency>
+
+        <!-- RuoYi Common DataScope -->
+        <dependency>
+            <groupId>com.bonus.sgzb</groupId>
+            <artifactId>sgzb-common-datascope</artifactId>
+        </dependency>
         
         <!-- RuoYi Common Log -->
         <dependency>
@@ -72,6 +84,13 @@
             <artifactId>sgzb-common-swagger</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>cn.hutool</groupId>
+            <artifactId>hutool-all</artifactId>
+            <version>5.8.16</version>
+            <scope>compile</scope>
+        </dependency>
+
     </dependencies>
 
     <build>
diff --git a/sgzb-modules/sgzb-gen/src/main/resources/mapper/generator/GenTableColumnMapper.xml b/sgzb-modules/sgzb-gen/src/main/resources/mapper/generator/GenTableColumnMapper.xml
index 8e84851e..3c206025 100644
--- a/sgzb-modules/sgzb-gen/src/main/resources/mapper/generator/GenTableColumnMapper.xml
+++ b/sgzb-modules/sgzb-gen/src/main/resources/mapper/generator/GenTableColumnMapper.xml
@@ -4,7 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.bonus.sgzb.gen.mapper.GenTableColumnMapper">
 
-    <resultMap type="GenTableColumn" id="GenTableColumnResult">
+    <resultMap type="com.bonus.sgzb.gen.domain.GenTableColumn" id="GenTableColumnResult">
         <id     property="columnId"       column="column_id"      />
         <result property="tableId"        column="table_id"       />
         <result property="columnName"     column="column_name"    />
@@ -33,7 +33,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         select column_id, table_id, column_name, column_comment, column_type, java_type, java_field, is_pk, is_increment, is_required, is_insert, is_edit, is_list, is_query, query_type, html_type, dict_type, sort, create_by, create_time, update_by, update_time from gen_table_column
     </sql>
 
-    <select id="selectGenTableColumnListByTableId" parameterType="GenTableColumn" resultMap="GenTableColumnResult">
+    <select id="selectGenTableColumnListByTableId" parameterType="com.bonus.sgzb.gen.domain.GenTableColumn" resultMap="GenTableColumnResult">
         <include refid="selectGenTableColumnVo"/>
         where table_id = #{tableId}
         order by sort
@@ -45,7 +45,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		order by ordinal_position
 	</select>
 
-    <insert id="insertGenTableColumn" parameterType="GenTableColumn" useGeneratedKeys="true" keyProperty="columnId">
+    <insert id="insertGenTableColumn" parameterType="com.bonus.sgzb.gen.domain.GenTableColumn" useGeneratedKeys="true" keyProperty="columnId">
         insert into gen_table_column (
 			<if test="tableId != null and tableId != ''">table_id,</if>
 			<if test="columnName != null and columnName != ''">column_name,</if>
@@ -89,7 +89,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
          )
     </insert>
 
-    <update id="updateGenTableColumn" parameterType="GenTableColumn">
+    <update id="updateGenTableColumn" parameterType="com.bonus.sgzb.gen.domain.GenTableColumn">
         update gen_table_column
         <set>
             <if test="columnComment != null">column_comment = #{columnComment},</if>
diff --git a/sgzb-modules/sgzb-gen/src/main/resources/mapper/generator/GenTableMapper.xml b/sgzb-modules/sgzb-gen/src/main/resources/mapper/generator/GenTableMapper.xml
index 26bccf92..e26097e3 100644
--- a/sgzb-modules/sgzb-gen/src/main/resources/mapper/generator/GenTableMapper.xml
+++ b/sgzb-modules/sgzb-gen/src/main/resources/mapper/generator/GenTableMapper.xml
@@ -4,7 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.bonus.sgzb.gen.mapper.GenTableMapper">
 
-	<resultMap type="GenTable" id="GenTableResult">
+	<resultMap type="com.bonus.sgzb.gen.domain.GenTable" id="GenTableResult">
 	    <id     property="tableId"        column="table_id"          />
 		<result property="tableName"      column="table_name"        />
 		<result property="tableComment"   column="table_comment"     />
@@ -28,7 +28,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		<collection  property="columns"  javaType="java.util.List"  resultMap="GenTableColumnResult" />
 	</resultMap>
 	
-	<resultMap type="GenTableColumn" id="GenTableColumnResult">
+	<resultMap type="com.bonus.sgzb.gen.domain.GenTableColumn" id="GenTableColumnResult">
         <id     property="columnId"       column="column_id"      />
         <result property="tableId"        column="table_id"       />
         <result property="columnName"     column="column_name"    />
@@ -57,7 +57,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         select table_id, table_name, table_comment, sub_table_name, sub_table_fk_name, class_name, tpl_category, package_name, module_name, business_name, function_name, function_author, gen_type, gen_path, options, create_by, create_time, update_by, update_time, remark from gen_table
     </sql>
     
-    <select id="selectGenTableList" parameterType="GenTable" resultMap="GenTableResult">
+    <select id="selectGenTableList" parameterType="com.bonus.sgzb.gen.domain.GenTable" resultMap="GenTableResult">
 		<include refid="selectGenTableVo"/>
 		<where>
 			<if test="tableName != null and tableName != ''">
@@ -75,7 +75,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		</where>
 	</select>
 
-	<select id="selectDbTableList" parameterType="GenTable" resultMap="GenTableResult">
+	<select id="selectDbTableList" parameterType="com.bonus.sgzb.gen.domain.GenTable" resultMap="GenTableResult">
 		select table_name, table_comment, create_time, update_time from information_schema.tables
 		where table_schema = (select database())
 		AND table_name NOT LIKE 'qrtz_%' AND table_name NOT LIKE 'gen_%'
@@ -134,7 +134,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		order by c.sort
 	</select>
 	
-	<insert id="insertGenTable" parameterType="GenTable" useGeneratedKeys="true" keyProperty="tableId">
+	<insert id="insertGenTable" parameterType="com.bonus.sgzb.gen.domain.GenTable" useGeneratedKeys="true" keyProperty="tableId">
         insert into gen_table (
 			<if test="tableName != null">table_name,</if>
 			<if test="tableComment != null and tableComment != ''">table_comment,</if>
@@ -168,7 +168,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
          )
     </insert>
     
-    <update id="updateGenTable" parameterType="GenTable">
+    <update id="updateGenTable" parameterType="com.bonus.sgzb.gen.domain.GenTable">
         update gen_table
         <set>
             <if test="tableName != null">table_name = #{tableName},</if>