Merge branch 'master' of http://47.100.37.243:10080/ZHOU/yunsu

# Conflicts:
#	cloud-model/src/main/java/com/hssx/cloudmodel/service/impl/MouldFileServiceImpl.java

cloud-model/src/main/java/com/hssx/cloudmodel/service/impl/VnoticeUserServiceImpl.java

@@ -56,7 +56,7 @@ public class VnoticeUserServiceImpl extends ServiceImpl<VnoticeUserMapper, Vnoti
             PageInfo<VnoticeUser> pageInfo = new PageInfo<VnoticeUser>(list);
             Map<String, Object> map = new HashMap<>();
             map.put("list", pageInfo);
-            map.put("isNotRedCount", count);
+            map.put("isNotReadCount", count);
             msg.data = map;
         } else {
             msg.setError("用户不存在或者未登录");