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

k94314517

2023-10-28 11ff07252c6e6ed90e810cd9e5d033e7c7438a45

 server/services/src/main/java/com/doumee/dao/business/vo/GoodsorderExportVO.java

@@ -46,7 +46,7 @@
    private BigDecimal closeMoney;

    @ApiModelProperty(value = "结算时间")
    @ExcelColumn(name="结算时间",width = 10,index = 6,align = HorizontalAlignment.CENTER,dateFormat = "yyyy-MM-dd HH:mm:ss")
//    @ExcelColumn(name="结算时间",width = 10,index = 6,align = HorizontalAlignment.CENTER,dateFormat = "yyyy-MM-dd HH:mm:ss")
    private Date closeDate;

    @ApiModelProperty(value = "退款金额(分）")