Merge remote-tracking branch 'origin/master'

CeDo

2021-04-22 be2d7ec232fbd22b5e46ec133485ea751520636d

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

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