Merge branch 'master' into 0929-master

liusheng

2025-10-21 9dd748e0352f31b6255be2860c177db0d20ac40e

 smartor/src/main/resources/mapper/smartor/ServiceSubtaskDetailMapper.xml

@@ -171,7 +171,9 @@
        where id = #{id}
    </select>

    <insert id="insertServiceSubtaskDetail" parameterType="com.smartor.domain.ServiceSubtaskDetail">
    <insert id="insertServiceSubtaskDetail" parameterType="com.smartor.domain.ServiceSubtaskDetail"
            useGeneratedKeys="true"
            keyProperty="id">
        insert into service_subtask_detail
        <trim prefix="(" suffix=")" suffixOverrides=",">
            <if test="id != null">id,</if>