Merge remote-tracking branch 'origin/master'

happy-cloud-wisdom/happy-cloud-wisdom-biz/src/main/java/org/jeecg/modules/hlwpayment/entity/HlwPayment.java

@@ -390,4 +390,10 @@ public class HlwPayment implements Serializable {
      * 只有通过平台的此字段才有值
      */
     private Integer cpId;
+
+    /**
+     * 平台简称
+     */
+    @TableField(exist = false)
+    private String cpAbbreviation;
 }

happy-cloud-wisdom/happy-cloud-wisdom-biz/src/main/java/org/jeecg/modules/hlwpayment/mapper/xml/HlwPaymentMapper.xml

@@ -24,6 +24,7 @@
 		sub.name AS "subcontractorName",
 		app.application_name AS "applicationName",
 		pd.payment_type AS "paymentType",
+		cp.cp_abbreviation AS "cpAbbreviation",
 		case when a.is_through_platform =1 then acc.balance else ac.balance end AS "accountBalance"
 	</sql>
 
@@ -34,6 +35,7 @@
 		LEFT JOIN hlw_subcontractor sub ON sub.id = a.subcontractor_id
 		LEFT JOIN hlw_application_setting app ON app.id = a.application_id
 		LEFT JOIN hlw_payment_detail pd ON pd.payment_id = a.id
+		LEFT JOIN hlw_cp_setting cp ON cp.id = a.cp_id
     </sql>