Merge remote-tracking branch 'origin/master'

liusheng

2 天以前 da026a34bcc97b2eb49607a3b02d94d8f683f997

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

@@ -54,7 +54,7 @@
    <select id="selectBaseDictOperationList" parameterType="com.smartor.domain.BaseDictOperation"
            resultMap="BaseDictOperationResult">
        <include refid="selectBaseDictOperationVo"/>
        <where>
        where 1=1
            <if test="opid != null ">
                and opid = #{opid}
            </if>
@@ -97,7 +97,6 @@
            <if test="pid != null ">
                and pid = #{pid}
            </if>
        </where>
    </select>

    <select id="selectBaseDictOperationById" parameterType="Long"