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

src/main/java/com/ydtech/modules/inv/model/InvAccountOperate.java

@@ -187,7 +187,8 @@ public class InvAccountOperate implements Serializable {
 
     private String delFlag;
 
-
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date payoutTime;
 
 
     @TableField(exist = false)

src/main/resources/mapper/modules/inv/InvAccountIncoiceMapper.xml

@@ -83,7 +83,7 @@ biller = values(biller) invoice_subjects = values(invoice_subjects) invoice_by =
                b.payout_time
         FROM inv_account_incoice a
             left join inv_account_operate b
-                on a.invoice_id = b.invoice_id WHERE a.del_flag = '0'
+                on a.invoice_id = b.invoice_id WHERE a.del_flag = '0' and b.del_flag = '0'
         <if test="invoiceId != null and invoiceId != '' ">
             and a.invoice_id = #{invoiceId}
         </if>