Revert "最新"

This reverts commit 9f82519e

adc-da-sys/src/main/java/com/adc/da/att/controller/AttFileEOController.java

@@ -276,14 +276,13 @@ public class AttFileEOController {
             TsUser tsUser = userDao.selectById(userId);
             if (tsUser != null) {
                 userMsg = tsUser.getUname() + ",";
-                //2021/7/28水印内容取消工号
-//                if (StringUtils.isNotEmpty(tsUser.getWorkNum())) {
-//                    userMsg += tsUser.getWorkNum() + ",";
-//                }
+                if (StringUtils.isNotEmpty(tsUser.getWorkNum())) {
+                    userMsg += tsUser.getWorkNum() + ",";
+                }
             }
             SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm");//设置日期格式
             String date = df.format(new Date());
-            String waterContent = userMsg+date ;
+            String waterContent = userMsg + date;
             //2020年9月5日  去掉水印处理
             //2021年7月25日要求下载生成水印
             WaterMarkUtil.waterMark(oldFilePath,waterFilePath,waterContent);

adc-da-sys/src/main/java/com/adc/da/person/controller/PersonCollectEOController.java

@@ -93,7 +93,7 @@ public class PersonCollectEOController extends BaseController<TsPersonCollect> {
 
 
     @ApiOperation(value = "|PersonCollectEO|修改")
-    @PutMapping(consumes = APPLICATION_JSON_UTF8_VALUE)
+    @PutMapping(consumes = APPLICATION_JSON_UTF8_VALUE,value = "/updatePersonCollect")
 //    @RequiresPermissions("person:personCollect:update")
     public ResponseMessage<TsPersonCollect> update(@RequestBody TsPersonCollect tsPersonCollect) throws Exception {
         tsPersonCollect.setModifyTime(new Date());