From 0f3db47c9a6c03611ac75118017f83d18ae062f2 Mon Sep 17 00:00:00 2001
From: 张天森 <1292933220@qq.com>
Date: 星期五, 25 十一月 2022 10:33:15 +0800
Subject: [PATCH] Merge branch 'huacheng_test' into haucheng_panzhihua
---
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