Merge remote-tracking branch 'origin/test' into test

huanghongfa

2021-10-18 a7ebf0ce7082e68f4aaf8a7a0e3e5e6c48dfaadb

 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