From 6c5165f73c90fbd4e22e4f9a39497b5a25ee37f9 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期四, 26 十二月 2024 09:53:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/system_service/src/main/java/com/doumee/dao/business/model/SmsEmail.java | 10 +++++-----
1 files changed, 5 insertions(+), 5 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 f481b52..a8f68d5 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,12 +74,12 @@
@ExcelColumn(name="閭")
private String email;
- @ApiModelProperty(value = "鐘舵�� 0鏈娇鐢� 1宸蹭娇鐢�")
- @ExcelColumn(name="鐘舵�� 0鏈娇鐢� 1宸蹭娇鐢�")
+ @ApiModelProperty(value = "鐘舵�� 0鏈娇鐢� 1宸蹭娇鐢� 2绛夊緟鍙戦��")
+ @ExcelColumn(name="鐘舵�� 0鏈娇鐢� 1宸蹭娇鐢� 2绛夊緟鍙戦��")
private Integer status;
- @ApiModelProperty(value = "绫诲瀷 0鐭俊 1閭欢")
- @ExcelColumn(name="绫诲瀷 0鐭俊 1閭欢")
+ @ApiModelProperty(value = "绫诲瀷 0鐭俊 1閭欢 2寰俊鍏紬鍙烽�氱煡")
+ @ExcelColumn(name="绫诲瀷 0鐭俊 1閭欢 2寰俊鍏紬鍙烽�氱煡")
private Integer type;
@ApiModelProperty(value = "鍏宠仈瀵硅薄缂栫爜", example = "1")
@@ -87,7 +87,7 @@
private Integer objId;
@ApiModelProperty(value = "鍏宠仈瀵硅薄绫诲瀷 0=楠岃瘉鐮侊紱1=璁垮涓氬姟锛�2=璁垮鎶ュ锛�3=闅愭偅闅忔墜鎷嶏紱4=鐢ㄨ溅鐢宠锛�5=浼氳瀹や俊鎭紱6=鐗╂祦杞﹂绾︼紱7=鐗╂祦杞︿綔涓�")
- @ExcelColumn(name="鍏宠仈瀵硅薄绫诲瀷 0=楠岃瘉鐮侊紱1=璁垮涓氬姟锛�2=璁垮鎶ュ锛�3=闅愭偅闅忔墜鎷嶏紱4=鐢ㄨ溅鐢宠锛�5=浼氳瀹や俊鎭紱6=鐗╂祦杞﹂绾︼紱7=鐗╂祦杞︿綔涓�")
+ @ExcelColumn(name="鍏宠仈瀵硅薄绫诲瀷 0=楠岃瘉鐮侊紱1=璁垮涓氬姟锛�2=璁垮鎶ュ锛�3=闅愭偅闅忔墜鎷嶏紱4=鐢ㄨ溅鐢宠锛�5=浼氳瀹や俊鎭紱6=鐗╂祦杞﹂绾︼紱7=鐗╂祦杞︿綔涓�;8=浼氳瀹ょ敵璇�")
private String objType;
@ApiModelProperty(value = "闄勪欢闆嗗悎")
--
Gitblit v1.9.3