From b98c8291bdf1a9edcc6f109904bd56ebdcdb5a0e Mon Sep 17 00:00:00 2001
From: "zhaokaiyao@91isoft.com" <6922339zky>
Date: Wed, 28 Jul 2021 09:07:48 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B0=B4=E5=8D=B0=E6=B7=BB=E5=8A=A0=E4=BA=86?=
 =?UTF-8?q?=E6=97=B6=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/adc/da/att/controller/AttFileEOController.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/adc-da-sys/src/main/java/com/adc/da/att/controller/AttFileEOController.java b/adc-da-sys/src/main/java/com/adc/da/att/controller/AttFileEOController.java
index f49b116c..4e7d55e0 100644
--- a/adc-da-sys/src/main/java/com/adc/da/att/controller/AttFileEOController.java
+++ b/adc-da-sys/src/main/java/com/adc/da/att/controller/AttFileEOController.java
@@ -280,9 +280,9 @@ public class AttFileEOController {
                     userMsg += tsUser.getWorkNum() + ",";
                 }
             }
-//            SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm");//设置日期格式
-//            String date = df.format(new Date());
-            String waterContent = userMsg ;
+            SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm");//设置日期格式
+            String date = df.format(new Date());
+            String waterContent = userMsg+date ;
             //2020年9月5日  去掉水印处理
             //2021年7月25日要求下载生成水印
             WaterMarkUtil.waterMark(oldFilePath,waterFilePath,waterContent);