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/controller/UserController.java

@@ -75,7 +75,7 @@ public class UserController {
     /**
      * 添加/修改用户
      * @param user
-     * 参数：id 用户id  account 账号  password 密码
+     * 参数：id 用户id  account 账号  password 密码 username 姓名
      * @return
      */
     @ApiOperation("修改用户密码")