Merge branch 'local_20221104' into huacheng_test

yanghui

2022-11-30 7a7c01d8ae0c0f2d7ffcaf8de5a7a1d49ba92c10

 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