From 4c77f59b41ea3383a115f780a94debd71f035a87 Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期五, 18 十一月 2022 17:08:44 +0800
Subject: [PATCH] Merge branch 'local_20221104' into huacheng_test

---
 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/shop/PageComFlowerOrderListDTO.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/shop/PageComFlowerOrderListDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/shop/PageComFlowerOrderListDTO.java
index 5eb8f18..77b9ad6 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/shop/PageComFlowerOrderListDTO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/shop/PageComFlowerOrderListDTO.java
@@ -22,7 +22,7 @@
     private Integer status;
 
     @ApiModelProperty(value = "自提点id")
-    private Integer pointId;
+    private Long pointId;
 
     @ApiModelProperty(value = "商户id")
     private Long storeId;

--
Gitblit v1.7.1