Merge remote-tracking branch 'origin/master'

liusheng

3 天以前 2cb8d69254e70e45d8957f60a9055f80487e17b1

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

@@ -48,6 +48,7 @@
    <sql id="selectSvyLibTemplateTargetoptionVo">
        select id,
               groupid,
--                is_exception,
               send_taskid,
               send_taskname,
               score,