From fa0d88157a1fd5e916e93d66472188571433162a Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期一, 25 十一月 2024 11:14:20 +0800
Subject: [PATCH] 合并代码
---
ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/Shop.java | 10 +++++++++-
1 files changed, 9 insertions(+), 1 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/Shop.java b/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/Shop.java
index 83dfe80..62d0f17 100644
--- a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/Shop.java
+++ b/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/Shop.java
@@ -60,7 +60,7 @@
@ApiModelProperty(value = "店长用户id")
@TableField("app_user_id")
- private Integer appUserId;
+ private Long appUserId;
@ApiModelProperty(value = "客户电话（同步到t_phone表）")
@TableField("service_tel")
@@ -146,6 +146,14 @@
@TableField("custom_order_number")
private Integer customOrderNumber;
+ @ApiModelProperty(value = "总评分")
+ @TableField("score")
+ private Integer score;
+
+ @ApiModelProperty(value = "评分数量")
+ @TableField("score_number")
+ private Integer scoreNumber;
+
@ApiModelProperty(value = "删除（0=否，1=是）")
@TableField("del_flag")
@TableLogic
--
Gitblit v1.7.1