Merge branch 'master' into master-手术随访

陈昶聿

6 小时以前 27700927ebef0dbe669433ec2cdd3170647c226a

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

@@ -160,6 +160,9 @@
        <if test="valueType != null  and valueType != ''">
            and value_type = #{valueType}
        </if>
        <if test="scriptid != null and scriptids==null ">
            and scriptid = #{scriptid}
        </if>
        <if test="scriptids != null ">
            and scriptid in
            <foreach item="scriptid" collection="scriptids" open="(" separator="," close=")">
@@ -275,8 +278,6 @@
            and template_type = #{templateType}
        </if>
    </select>




    <select id="selectServiceSubtaskDetailTtraceById" parameterType="Long"