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

935090232@qq.com

2021-01-06 7b9cb4464cf7a6db758214c5681b0ecdf01e3db4

 zq-erp/src/main/java/com/matrix/system/app/vo/OrderDetailVo.java

@@ -55,7 +55,7 @@
    @ApiModelProperty(value = "欠款")
    private BigDecimal arrears;

    @JsonFormat(pattern = DateUtil.DATE_FORMAT_SS)
    @JsonFormat(pattern = DateUtil.DATE_FORMAT_SS, timezone = "GMT+8")
    @ApiModelProperty(value = "下单时间")
    private Date orderTime;