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

2021-12-17 11:16:12 +08:00
parent 773e33988e 62bb294f09
commit 204a2c8225
11 changed files with 142 additions and 89 deletions
@@ -901,9 +901,6 @@
            <!-- 标准名称 -->
            <if test="standName != null and standName != ''">
                and stand_name like concat(concat('%',#{standName}),'%')
-                or STAND_NUMBER like concat(concat('%',#{standName}),'%')
-                or STAND_YEAR like concat(concat('%',#{standName}),'%')
-                or STAND_SORT like concat(concat('%',#{standName}),'%')
            </if>
            <if test="standEnName != null and standEnName != ''">
                and stand_en_name like concat(concat('%',#{standEnName}),'%')