Merge branch 'refs/heads/dev' into test

zt-module-base/zt-module-base-server/src/main/resources/mapper/base/CompanyRelativityMapper.xml

@@ -31,10 +31,10 @@
         where d.DELETED = 0
           and d.IS_COMPANY = 1
         <if test="erpNumber != null">
-            and c.NUM = #{erpNumber}
+            and c.NUM like concat('%', #{erpNumber}, '%')
         </if>
         <if test="number != null">
-            and d.CODE = #{number}
+            and d.CODE like concat('%', #{number}, '%')
         </if>
         <if test="name != null">
             and d.NAME like concat('%', #{name}, '%')