Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/main/java/com/ygj/yuemum/component/Constant.java

src/main/java/com/ygj/yuemum/component/Constant.java

@@ -65,6 +65,7 @@ public class Constant {
     public static Integer AGE;
     public static Integer MAXSCHOLARSHIPS;
     public static String CREATEQRURL;
+    public static String FOLDER;
 
     //注入
     @Autowired(required = false)
@@ -310,4 +311,8 @@ public class Constant {
     public void getCREATEQRURL(@Value("${api.CREATEQRURL}") String CREATEQRURL) {
         Constant.CREATEQRURL = CREATEQRURL;
     }
+    @Autowired(required = false)
+    public void getMAXSCHOLARSHIPS(@Value("${chuanyun.OssFolder}") String OssFolder) {
+        Constant.FOLDER = OssFolder;
+    }
 }