Merge branch 'main' of http://39.101.188.84:8000/suzhou-jichuang-lanhai/Suzhouyingji3Java into zhangtao

ruoyi-system/src/main/resources/mapper/yingji/BEnterpriseNewMapper.xml

@@ -77,13 +77,13 @@
                 #{enterpriseName}, '%')
             </if>
             <if test="district != null and district.length==3">
-                and a.district like concat('%',#{district}, '%')
+                and s.district like concat('%',#{district}, '%')
             </if>
             <if test="district != null and district.length==6">
-                and a.district like concat('%',#{district}, '%')
+                and s.district like concat('%',#{district}, '%')
             </if>
             <if test="district != null and district != '' and district.length!=3 and district.length!=6">
-                and a.district in
+                and s.district in
                 <foreach item="item" index="index" collection="district.split(',')" open="(" separator="," close=")">
                     #{item}
                 </foreach>