From d492850f1cc64ddcfaf43798af9c76c2505414fd Mon Sep 17 00:00:00 2001
From: renkang <8417338+k94314517@user.noreply.gitee.com>
Date: 星期五, 24 一月 2025 18:24:31 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0.1' into 2.0.1
---
server/system_service/src/main/java/com/doumee/dao/business/model/SmsEmail.java | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/server/system_service/src/main/java/com/doumee/dao/business/model/SmsEmail.java b/server/system_service/src/main/java/com/doumee/dao/business/model/SmsEmail.java
index 0d205a8..f28469d 100644
--- a/server/system_service/src/main/java/com/doumee/dao/business/model/SmsEmail.java
+++ b/server/system_service/src/main/java/com/doumee/dao/business/model/SmsEmail.java
@@ -74,8 +74,8 @@
@ExcelColumn(name="閭")
private String email;
- @ApiModelProperty(value = "鐘舵�� 0鏈娇鐢� 1宸蹭娇鐢� 2绛夊緟鍙戦��")
- @ExcelColumn(name="鐘舵�� 0鏈娇鐢� 1宸蹭娇鐢� 2绛夊緟鍙戦��")
+ @ApiModelProperty(value = "鐘舵�� 0=鎴愬姛锛�1=澶辫触")
+ @ExcelColumn(name="鐘舵�� 0=鎴愬姛锛�1=澶辫触")
private Integer status;
@ApiModelProperty(value = "绫诲瀷 0鐭俊 1閭欢")
@@ -86,8 +86,8 @@
@ExcelColumn(name="鍏宠仈瀵硅薄缂栫爜")
private Integer objId;
- @ApiModelProperty(value = "鍏宠仈瀵硅薄绫诲瀷 0=楠岃瘉鐮侊紱1=璁垮涓氬姟锛�2=璁垮鎶ュ锛�3=闅愭偅闅忔墜鎷嶏紱4=鐢ㄨ溅鐢宠锛�5=浼氳瀹や俊鎭紱6=鐗╂祦杞﹂绾︼紱7=鐗╂祦杞︿綔涓�")
- @ExcelColumn(name="鍏宠仈瀵硅薄绫诲瀷 0=楠岃瘉鐮侊紱1=璁垮涓氬姟锛�2=璁垮鎶ュ锛�3=闅愭偅闅忔墜鎷嶏紱4=鐢ㄨ溅鐢宠锛�5=浼氳瀹や俊鎭紱6=鐗╂祦杞﹂绾︼紱7=鐗╂祦杞︿綔涓�;8=浼氳瀹ょ敵璇�")
+ @ApiModelProperty(value = "鍏宠仈瀵硅薄绫诲瀷 0=楠岃瘉鐮侊紱1=鍌垂鐭俊锛�2=鍌垂閭欢")
+ @ExcelColumn(name="鍏宠仈瀵硅薄绫诲瀷 0=楠岃瘉鐮侊紱1=鍌垂鐭俊锛�2=鍌垂閭欢")
private String objType;
@ApiModelProperty(value = "闄勪欢闆嗗悎")
--
Gitblit v1.9.3