Merge remote-tracking branch 'origin/master'

huanghongfa

2021-04-22 40c6bb2a4e15f3c2a5a72f3842404b49a25d4be8

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/shop/ComShopOrderDeliverDTO.java

@@ -15,10 +15,8 @@
 * @Version 1.0
 **/
@Data
@ApiModel("订单发货信息")
@ApiModel("订单配送信息")
public class ComShopOrderDeliverDTO {
    @ApiModelProperty(value = "订单号")
    private String orderNo;
    @ApiModelProperty(value = "订单ID")
    private Long orderId;
}