Merge remote-tracking branch 'origin/main'

ruoyi-system/src/main/resources/mapper/system/GradTableMapper.xml

@@ -20,10 +20,11 @@
         <result property="userEmail"    column="user_email"    />
         <result property="updateDate"    column="update_date"    />
         <result property="id"    column="id"    />
+        <result property="templateId" column="template_id"/>
     </resultMap>
 
     <sql id="selectGradTableVo">
-        select cert_type, uesr_name, user_id, cert_id, issue_date, cert_name, course_name, course_hours, level, train_period, picture, user_phone, user_email, update_date, id from grad_table
+        select cert_type, uesr_name, user_id, cert_id, issue_date, cert_name, course_name, course_hours, level, train_period, picture, user_phone, user_email, update_date, id, template_id from grad_table
     </sql>
 
     <select id="selectGradTableList" parameterType="GradTable" resultMap="GradTableResult">
@@ -72,6 +73,7 @@
             <if test="userPhone != null">user_phone,</if>
             <if test="userEmail != null">user_email,</if>
             <if test="updateDate != null">update_date,</if>
+            <if test="templateId != null">template_id,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="certType != null">#{certType},</if>
@@ -88,6 +90,7 @@
             <if test="userPhone != null">#{userPhone},</if>
             <if test="userEmail != null">#{userEmail},</if>
             <if test="updateDate != null">#{updateDate},</if>
+            <if test="templateId != null">#{templateId},</if>
         </trim>
     </insert>
 
@@ -108,6 +111,7 @@
             <if test="userPhone != null">user_phone = #{userPhone},</if>
             <if test="userEmail != null">user_email = #{userEmail},</if>
             <if test="updateDate != null">update_date = #{updateDate},</if>
+            <if test="templateId != null">template_id = #{templateId},</if>
         </trim>
         where id = #{id}
     </update>