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

sen

6 天以前 fd765fb823fb60fc942b09e17a5d13ad4aef2f96

 api/src/main/java/com/ruoyi/api/third/controller/ReceivableBillApiController.java

@@ -182,6 +182,7 @@
        billManagement.setSettlementPeriod(billDto.getSettlementPeriod());
        billManagement.setStatus(billDto.getStatus() != null ? billDto.getStatus() : "draft");
        billManagement.setAuditStatus(billDto.getAuditStatus() != null ? billDto.getAuditStatus() : 0);
        billManagement.setSourceSystemId(billDto.getSourceSystemId());
        billManagement.setRemark(billDto.getRemark());
        billManagement.setCreateTime(DateUtils.getNowDate());
        billManagement.setCreateBy("api_system");
@@ -428,6 +429,7 @@
        // 设置其他信息
        billManagement.setStatus(billDto.getStatus() != null ? billDto.getStatus() : "draft");
        billManagement.setAuditStatus(billDto.getAuditStatus() != null ? billDto.getAuditStatus() : 0);
        billManagement.setSourceSystemId(billDto.getSourceSystemId());
        billManagement.setRemark(billDto.getRemark());
        billManagement.setCreateTime(DateUtils.getNowDate());
        billManagement.setCreateBy("api_system");