From e8dd7cfa6bbfd8be4a52f24e03c74f853cc6ac4f Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期一, 26 一月 2026 18:34:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/dmmall_service/src/main/java/com/doumee/dao/business/model/Notice.java | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/server/dmmall_service/src/main/java/com/doumee/dao/business/model/Notice.java b/server/dmmall_service/src/main/java/com/doumee/dao/business/model/Notice.java
index d6aabb7..970655a 100644
--- a/server/dmmall_service/src/main/java/com/doumee/dao/business/model/Notice.java
+++ b/server/dmmall_service/src/main/java/com/doumee/dao/business/model/Notice.java
@@ -84,8 +84,8 @@
@ExcelColumn(name="瀵硅薄绫诲瀷 0鍟嗗煄璁㈠崟 1绉垎娴佹按 2浜掑姩璇勪环 3浼樻儬鍒� 4鐜伴噾娴佹按")
private Integer objType;
- @ApiModelProperty(value = "娑堟伅绫诲瀷 0娑堣垂鑰咃紱1=缁忛攢鍟嗙Н鍒嗭紱2=缁忛攢鍟嗙粨绠楅噾棰� ", example = "1")
- @ExcelColumn(name="娑堟伅绫诲瀷 0娑堣垂鑰咃紱1=缁忛攢鍟嗙Н鍒嗭紱2=缁忛攢鍟嗙粨绠楅噾棰� ")
+ @ApiModelProperty(value = "娑堟伅绫诲瀷 0娑堣垂鑰呮秷鎭紱1=缁忛攢鍟嗘秷鎭紱", example = "1")
+ @ExcelColumn(name="娑堟伅绫诲瀷 0娑堣垂鑰呮秷鎭紱1=缁忛攢鍟嗘秷鎭紱")
private Integer type;
@ApiModelProperty(value = "鐘舵�� 0鏈 1宸茶", example = "1")
@@ -104,4 +104,7 @@
@TableField(exist = false)
private Integer shopId;
+ @ApiModelProperty(value = "鏌ヨ绫诲瀷锛�0=绯荤粺娑堟伅锛�1=绀惧尯娑堟伅锛�", example = "1")
+ @TableField(exist = false)
+ private Integer queryType;
}
--
Gitblit v1.9.3