From c6a96d1162cb60d1bd30c8f5fde7a93985b79276 Mon Sep 17 00:00:00 2001 From: jiangping <jp@doumee.com> Date: 星期三, 09 十月 2024 16:31:28 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/SmsEmail.java | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/SmsEmail.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/SmsEmail.java index 68b1c6e..f481b52 100644 --- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/SmsEmail.java +++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/SmsEmail.java @@ -86,9 +86,10 @@ @ExcelColumn(name="鍏宠仈瀵硅薄缂栫爜") private Integer objId; - @ApiModelProperty(value = "鍏宠仈瀵硅薄绫诲瀷") - @ExcelColumn(name="鍏宠仈瀵硅薄绫诲瀷") + @ApiModelProperty(value = "鍏宠仈瀵硅薄绫诲瀷 0=楠岃瘉鐮侊紱1=璁垮涓氬姟锛�2=璁垮鎶ュ锛�3=闅愭偅闅忔墜鎷嶏紱4=鐢ㄨ溅鐢宠锛�5=浼氳瀹や俊鎭紱6=鐗╂祦杞﹂绾︼紱7=鐗╂祦杞︿綔涓�") + @ExcelColumn(name="鍏宠仈瀵硅薄绫诲瀷 0=楠岃瘉鐮侊紱1=璁垮涓氬姟锛�2=璁垮鎶ュ锛�3=闅愭偅闅忔墜鎷嶏紱4=鐢ㄨ溅鐢宠锛�5=浼氳瀹や俊鎭紱6=鐗╂祦杞﹂绾︼紱7=鐗╂祦杞︿綔涓�") private String objType; + @ApiModelProperty(value = "闄勪欢闆嗗悎") @TableField(exist = false) private List<Map<String,Object>> fileList; -- Gitblit v1.9.3