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/util/GainTokenUtil.java

@@ -25,7 +25,6 @@ public class GainTokenUtil {
             // 获取值赋值给全局变量
             if (!json.containsKey("errcode")) {
                 newAccessToken = json.getString("access_token");
-
             }
         } catch (Exception e) {
             e.printStackTrace();