From 5f37dc3fac7e65e19ea02303243c4fd107f5f5cb Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期五, 14 六月 2024 19:41:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0
---
cloud-server-other/src/main/java/com/dsh/other/entity/Store.java | 13 ++++++++-----
1 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/cloud-server-other/src/main/java/com/dsh/other/entity/Store.java b/cloud-server-other/src/main/java/com/dsh/other/entity/Store.java
index 0a50bf9..82662f6 100644
--- a/cloud-server-other/src/main/java/com/dsh/other/entity/Store.java
+++ b/cloud-server-other/src/main/java/com/dsh/other/entity/Store.java
@@ -120,11 +120,6 @@
@TableField("welfarePicture")
private String welfarePicture;
/**
- * 开始上课图片
- */
- @TableField("classPicture")
- private String classPicture;
- /**
* 评分
*/
@TableField("score")
@@ -136,6 +131,14 @@
private Integer state;
+ @TableField("operatorId")
+ private Integer operatorId;
+
+ @TableField(exist = false)
+ private String oName;
+
+ private String ids;
+
@Override
protected Serializable pkVal() {
return this.id;
--
Gitblit v1.7.1