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

陈昶聿

3 小时以前 27700927ebef0dbe669433ec2cdd3170647c226a

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

@@ -74,6 +74,14 @@
            <if test="remark != null  and remark != ''">and remark = #{remark}</if>
    </select>

    <select id="selectServiceSubtaskRecordBySubtaskIds" resultMap="ServiceSubtaskRecordResult">
        <include refid="selectServiceSubtaskRecordVo"/>
        where subtask_id IN
        <foreach collection="list" item="subtaskId" open="(" separator="," close=")">
            #{subtaskId}
        </foreach>
    </select>

    <select id="selectServiceSubtaskRecordById" parameterType="Long" resultMap="ServiceSubtaskRecordResult">
        <include refid="selectServiceSubtaskRecordVo"/>
        where id = #{id}