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

liyong

10 天以前 88e384da863bb2f7324cb1e1474885df3b7cce91

 yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/sale/vo/order/ErpSaleOrderRespVO.java

@@ -33,6 +33,12 @@
    @ExcelProperty("客户名称")
    private String customerName;

    @Schema(description = "关联合同编号", example = "1")
    private Long contractId;
    @Schema(description = "合同单号", example = "HT001")
    @ExcelProperty("合同单号")
    private String contractNo;

    @Schema(description = "结算账户编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "311.89")
    @ExcelProperty("结算账户编号")
    private Long accountId;