Merge remote-tracking branch 'origin/develop_master' into develop_master

2022-01-21 08:13:03 +08:00
parent c239ad7c99 0c387355b4
commit c97e8442f4
112 changed files with 2249 additions and 540 deletions
@@ -602,6 +602,11 @@
        </foreach>
        FROM
        TS_DICTYPE
+        <where>
+            <foreach collection="filed" index="index" item="item"  separator=" and " >
+                ${item} is not NULL
+            </foreach>
+        </where>

    </select>