Merge remote-tracking branch 'origin/master'

liusheng

2 天以前 fb9c56894fcee50e17f47253728a4ef0f16a1e0a

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

@@ -186,6 +186,7 @@
                    #{dimension}
                </foreach>
            </if>
            <if test="dimensionList == null ">and dimension IS NOT NULL </if>
        </where>
    </select>