Merge remote-tracking branch 'origin/master'

happy-cloud-wisdom/happy-cloud-wisdom-biz/src/main/java/org/jeecg/modules/hlwaccount/mapper/xml/HlwCompanyMapper.xml

@@ -220,7 +220,8 @@
 				and a.create_time between #{hlwCompany.createTimeBegin} and #{hlwCompany.createTimeEnd}
 			</if>
 			<if test="hlwCompany.provinceCityCountry != null and hlwCompany.provinceCityCountry != ''">
-				AND a.province_city_country LIKE concat('%',#{hlwCompany.provinceCityCountry},'%')
+				AND (a.province_city_country LIKE concat('%',#{hlwCompany.provinceCityCountry},'%')
+				     or a.address LIKE concat('%',#{hlwCompany.provinceCityCountry},'%'))
 			</if>
 		</where>
 		group by a.id

happy-cloud-wisdom/happy-cloud-wisdom-biz/src/main/java/org/jeecg/modules/hlwsubcontractor/entity/HlwSubcontractorInvoiceCategory.java

@@ -89,4 +89,9 @@ public class HlwSubcontractorInvoiceCategory implements Serializable {
      */
     @TableField(exist = false)
     private String invoiceCategoryName;
+    /**
+     * 税收分类名称
+     */
+    @TableField(exist = false)
+    private java.lang.String taxCategoryName;
 }

happy-cloud-wisdom/happy-cloud-wisdom-biz/src/main/java/org/jeecg/modules/hlwsubcontractor/mapper/xml/HlwSubcontractorInvoiceCategoryMapper.xml

@@ -12,7 +12,8 @@
         a.create_by AS "createBy",
         a.update_time AS "updateTime",
         a.update_by AS "updateBy",
-        hic.invoice_category_name AS "invoiceCategoryName"
+        hic.invoice_category_name AS "invoiceCategoryName",
+        hic.tax_category_name AS "taxCategoryName"
         from hlw_subcontractor_invoice_category a
         LEFT JOIN hlw_invoice_category hic on hic.id = a.invoice_category_id
         <where>