Merge branch 'test' into 'test_bak'

罗元桥

2021-10-01 d0ae6a6e9a8123f4869417b46e5d7423f8ca66d6

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

@@ -3,9 +3,6 @@
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.NonNull;

import javax.validation.constraints.Min;

/**
 * @ClasssName OrderShipDTO