Merge remote-tracking branch 'origin/master'

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentrecord/FinPaymentrecordVo.java

@@ -97,4 +97,6 @@ public class FinPaymentrecordVo implements Vo {
     private String payWayValue;
     @ApiModelProperty("批量处理编码")
     private String batchNumber;
+    @ApiModelProperty("推送财务数据类型（0付款单,1凭证）")
+    private Integer finDataType;
 }

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordMapper.xml

@@ -28,7 +28,8 @@
                fp.busRemarks,
                fp.payWayKey,
                fp.payWayValue,
-                fp.batchNumber
+                fp.batchNumber,
+               fp.finDataType
         FROM fin_paymentrecord fp
         LEFT JOIN anrui_portal.sys_organization so ON fp.createOrgSid = so.sid
         <where>

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordService.java

@@ -1025,10 +1025,6 @@ public class FinPaymentrecordService extends MybatisBaseService<FinPaymentrecord
         return rb.success();
     }
 
-    private Voucher pushPaymentVoucherReturnVoucher(String busSid, String sid) {
-
-        return null;
-    }
 
     public ApPayBill buildBatchApPayBill(List<ApPayBill> list) {
         ApPayBill apPayBill = new ApPayBill();