Merge branch 'local_20221104' into huacheng_test

yanghui

2022-12-01 a0f33f915dd4128d98111f67a3c75b1676adae32

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

@@ -49,4 +49,7 @@

    @ApiModelProperty("配送方式（1.自提  2.快递）")
    private Integer deliveryType;

    @ApiModelProperty(value = "关键词")
    private String keyWord;
}