Merge remote-tracking branch 'origin/master'

liusheng

3 天以前 2cb8d69254e70e45d8957f60a9055f80487e17b1

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

@@ -1238,6 +1238,9 @@
            <if test="continueContent != null ">continue_content = #{continueContent},</if>
        </trim>
        where patid = #{patid} and taskid = #{taskid}
        <if test="id != null ">
            and id = #{id}
        </if>
    </update>

    <update id="updateServiceSubtaskByTaskGuid" parameterType="com.smartor.domain.ServiceSubtask">