Merge remote-tracking branch 'origin/master'

liusheng

2 天以前 da026a34bcc97b2eb49607a3b02d94d8f683f997

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

@@ -38,7 +38,7 @@
    <select id="selectServicePatientTempList" parameterType="com.smartor.domain.ServicePatientTemp"
            resultMap="ServicePatientTempResult">
        <include refid="selectServicePatientTempVo"/>
        <where>
        where 1=1
            <if test="userId != null ">
                and user_id = #{userId}
            </if>
@@ -60,7 +60,6 @@
            <if test="orgid != null ">
                and orgid = #{orgid}
            </if>
        </where>
    </select>

    <select id="selectServicePatientTempById" parameterType="Long"