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

commons/src/main/java/com/jzg/commons/entity/finance/po/InsPlyIncome.java

@@ -294,4 +294,8 @@ public class InsPlyIncome extends BaseModel {
     @Schema(description = "订单关联的发票信息")
     private String invoiceId;
 
+    @TableField(exist = false)
+    @Schema(description = "地区归属")
+    private String companyNameSimple;
+
 }

tenant/organization/src/main/resources/mapper/ReceivableMapper.xml

@@ -243,7 +243,8 @@
         io.company_name,
         io.company_id,
         io.create_time,
-        io.docking_person
+        io.docking_person,
+        eic.name_simple as companyNameSimple
         FROM
         ins_ply_income ipi
         LEFT JOIN ins_orders io ON ipi.order_no = io.id
@@ -251,6 +252,7 @@
         LEFT JOIN ins_orders_risk ior1 ON ipi.order_no = ior1.order_no and ior1.risk_code = '0507'
         LEFT JOIN ins_orders_risk ior2 ON ipi.order_no = ior2.order_no and ior2.risk_code = '0510'
         LEFT JOIN ins_orders_policy iop ON ipi.order_no = iop.order_no
+        LEFT JOIN esm_ins_company eic on ipi.company_id = eic.id
         WHERE 1=1 and ipi.settlement_status = '0' and ipi.is_delete  = 0
     </sql>