Merge branch 'dev_ztns' into dev_ywx_ztns

zouyu

昨天 6fb742d463ecac5e7d4934d7248a40979edc3626

 basic-server/src/main/resources/mapper/StructureTestMapper.xml

@@ -31,6 +31,7 @@
        <if test="ew.customSqlSegment != null and ew.customSqlSegment != ''">
            ${ew.customSqlSegment}
        </if>

    </select>

</mapper>