modify

Helius

2021-07-01 722744a72032a8cd3f8d836859dc32789bb237a9

modify

 gc-order/src/main/java/com/xzx/gc/order/vo/JhyOrderListVo.java

@@ -4,6 +4,8 @@
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.util.Date;

@Data
@ApiModel(value = "JhyOrderListVo", description = "集物员订单列表返回参数类")
public class JhyOrderListVo {
@@ -35,6 +37,9 @@
    @ApiModelProperty(value = "重量")
    private String weight;

    @ApiModelProperty(value = "取货时间")
    private String receivingTime;

    @ApiModelProperty(value = "备注")
    private String remark;


 gc-order/src/main/resources/mapper/order/JhyOrderMapper.xml

@@ -13,6 +13,7 @@
            ,a.weight
            ,a.status
            ,a.remark
            ,date_format(a.receiving_time, '%Y-%m-%d %H:%d') receivingTime
            ,CONCAT(a.reserve_date, ' ', a.reserve_time) reserveTime
            ,GROUP_CONCAT(b.title) items
            ,c.username jhyName