Merge branch 'develop' of git.yfzx.zjtys.com.cn:zhuangshuang/EncryptedFileSystem into develop

efs-bus/src/main/java/com/zjty/efs/bus/Dao/NoticeDao.java

@@ -13,6 +13,6 @@ import java.util.List;
 public interface NoticeDao extends JpaRepository<Notice , Integer> {
     Notice findById(int id);
     Page<Notice> findOutBySenderAndType(String sender, int type, Pageable pageable);
-    Page<Notice> findOutByAddresseeAndType(String addressee, int type, Pageable pageable);
+    Page<Notice> findOutByAddresseeLikeAndType(String addressee, int type, Pageable pageable);
     List<Notice> findOutByStatusAndType(int status, int type);
 }

efs-bus/src/main/java/com/zjty/efs/bus/controller/NoticeController.java

@@ -61,7 +61,7 @@ public class NoticeController {
 
     @GetMapping("/getNoticeList")
     @ApiOperation(value = "获取通知列表接口", notes = "获取列表，type为通知类型，接收 0，发送 1，草稿 2")
-    @ApiImplicitParams({@ApiImplicitParam(name = "user", value = "当前用户名称", paramType = "query", required = true, example = "account", dataType = "int"),
+    @ApiImplicitParams({@ApiImplicitParam(name = "user", value = "当前用户名称", paramType = "query", required = true, example = "account", dataType = "String"),
     @ApiImplicitParam(name = "type", value = "通知类型", paramType = "query", required = true, example = "0", dataType = "int"),
     @ApiImplicitParam(name = "pageNum", value = "页码", paramType = "query", required = true, dataType = "int"),
     @ApiImplicitParam(name = "pageSize", value = "条数", paramType = "query", required = true, dataType = "int")})

efs-bus/src/main/java/com/zjty/efs/bus/entity/FileList.java → efs-bus/src/main/java/com/zjty/efs/bus/entity/Addressee.java

@@ -10,8 +10,8 @@ import java.lang.annotation.Documented;
 @AllArgsConstructor
 @NoArgsConstructor
 @Data
-public class FileList {
+public class Addressee {
     private String id;
-    private String address;
+    private String name;
 
 }