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

销售管理 客户资料
修改其他收货地址页面搜索栏字段名称，和表格内保存一致；
修改其他开票信息mapper查找列表方法，企业代码模糊搜索；

ruoyi-admin/src/main/resources/mapper/system/SysInvoiceMapper.xml

@@ -29,7 +29,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectSysInvoiceList" parameterType="SysInvoice" resultMap="SysInvoiceResult">
         <include refid="selectSysInvoiceVo"/>
         <where>  
-            <if test="enterpriseCode != null  and enterpriseCode != ''"> and enterprise_code = #{enterpriseCode}</if>
+            <if test="enterpriseCode != null  and enterpriseCode != ''"> and enterprise_code like concat('%', #{enterpriseCode}, '%')</if>
             <if test="enterpriseName != null  and enterpriseName != ''"> and enterprise_name like concat('%', #{enterpriseName}, '%')</if>
         </where>
     </select>

ruoyi-admin/src/main/resources/templates/system/shippingaddress/shippingaddress.html

@@ -11,7 +11,7 @@
                 <div class="select-list">
                     <ul>
                         <li>
-                            <label>企业名称：</label>
+                            <label>客户/企业名称：</label>
                             <input type="text" name="enterpriseName"/>
                         </li>
                         <li>