Merge remote-tracking branch 'origin/master'

liusheng

2 天以前 da026a34bcc97b2eb49607a3b02d94d8f683f997

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

@@ -36,8 +36,8 @@
    <select id="selectServiceOutPathList" parameterType="com.smartor.domain.ServiceOutPath"
            resultMap="ServiceOutPathResult">
        <include refid="selectServiceOutPathVo"/>
        <where>
            del_flag=0
        where 1=1
            and del_flag = 0
            and orgid is null
            <if test="param1 != null ">
                and param1 = #{param1}
@@ -58,7 +58,6 @@
                and radix=#{radix}
            </if>

        </where>
    </select>

    <select id="selectServiceOutPathById" parameterType="Long"