Merge remote-tracking branch 'origin/haucheng_panzhihua' into haucheng_panz...

yanghui

2022-12-08 5e7892cd0921111dfbaf84196f2593f8045d1c11

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/ComShopOrderSearchVO.java

@@ -94,7 +94,10 @@
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date createAt;


    @ApiModelProperty("自提点地址")
    private String address;

    @ApiModelProperty("自提点名称")
    private String pointName;

}