Merge remote-tracking branch 'origin/dev-2.0.1' into dev-2.0.1

liujie

2025-05-20 39faeb972b20562bf2f0b7b8cc4474ea8a3998e1

 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;
}