From cbe903c4c4493715ad8d307107fb95975acfc975 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期四, 23 四月 2026 16:14:21 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 smartor/src/main/resources/mapper/smartor/SvyLibScriptOptionMapper.xml |   12 ++++++++++++
 1 files changed, 12 insertions(+), 0 deletions(-)

diff --git a/smartor/src/main/resources/mapper/smartor/SvyLibScriptOptionMapper.xml b/smartor/src/main/resources/mapper/smartor/SvyLibScriptOptionMapper.xml
index 5e567db..f538797 100644
--- a/smartor/src/main/resources/mapper/smartor/SvyLibScriptOptionMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/SvyLibScriptOptionMapper.xml
@@ -35,17 +35,20 @@
         <result property="createTime" column="create_time"/>
         <result property="updateBy" column="update_by"/>
         <result property="updateTime" column="update_time"/>
+        <result property="isException" column="is_exception"/>
         <result property="isupload" column="isupload"/>
         <result property="uploadTime" column="upload_time"/>
         <result property="appendflag" column="appendflag"/>
         <result property="appenddesc" column="appenddesc"/>
         <result property="guid" column="guid"/>
+        <result property="defaultValue" column="default_value"/>
     </resultMap>
 
     <sql id="selectSvyLibScriptOptionVo">
         select id,
                topicid,
                svyid,
+               default_value,
                guid,
                picture_path,
                appendflag,
@@ -77,6 +80,7 @@
                update_by,
                update_time,
                isupload,
+               is_exception,
                upload_time
         from svy_lib_scriptoption
     </sql>
@@ -114,6 +118,8 @@
             <if test="appendflag != null">and appendflag = #{appendflag}</if>
             <if test="appenddesc != null">and appenddesc = #{appenddesc}</if>
             <if test="picturePath != null">and picture_path = #{picturePath}</if>
+            <if test="isException != null">and is_exception = #{isException}</if>
+            <if test="defaultValue != null">and default_value = #{defaultValue}</if>
     </select>
 
     <select id="selectSvyLibScriptOptionByOptionid" parameterType="Long" resultMap="SvyLibScriptOptionResult">
@@ -159,6 +165,8 @@
             <if test="appenddesc != null">appenddesc,</if>
             <if test="picturePath != null">picture_path,</if>
             <if test="guid != null">guid,</if>
+            <if test="isException != null">is_exception,</if>
+            <if test="defaultValue != null">default_value,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="topicid != null">#{topicid},</if>
@@ -195,6 +203,8 @@
             <if test="appenddesc != null">#{appenddesc},</if>
             <if test="picturePath != null">#{picturePath},</if>
             <if test="guid != null">#{guid},</if>
+            <if test="isException != null">#{isException},</if>
+            <if test="defaultValue != null">#{defaultValue},</if>
         </trim>
     </insert>
 
@@ -234,6 +244,8 @@
             <if test="appendflag != null">appendflag = #{appendflag},</if>
             <if test="appenddesc != null">appenddesc = #{appenddesc},</if>
             <if test="picturePath != null">picture_path = #{picturePath},</if>
+            <if test="isException != null">is_exception = #{isException},</if>
+            <if test="defaultValue != null">default_value = #{defaultValue},</if>
         </trim>
         where id = #{id}
     </update>

--
Gitblit v1.9.3