Merge remote-tracking branch 'origin/master'

liusheng

2 天以前 da026a34bcc97b2eb49607a3b02d94d8f683f997

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

@@ -37,7 +37,7 @@
    <select id="selectPatMedOperationItemList" parameterType="com.smartor.domain.PatMedOperationItem"
            resultMap="PatMedOperationItemResult">
        <include refid="selectPatMedOperationItemVo"/>
        <where>
        where 1=1
                        <if test="operationid != null ">
                            and operationid = #{operationid}
                        </if>
@@ -86,7 +86,6 @@
                        <if test="pid != null ">
                            and pid = #{pid}
                        </if>
        </where>
    </select>

    <select id="selectPatMedOperationItemById" parameterType="Long"