Merge branch 'api' into order_reform

Helius

2021-01-11 854d9d55a86b7076abc4f526e90001bd806d324c

 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;