Merge remote-tracking branch 'origin/master_saas' into master_saas

mec-biz/src/main/java/com/ym/mec/biz/service/impl/SysCouponCodeServiceImpl.java

@@ -152,7 +152,7 @@ public class SysCouponCodeServiceImpl extends BaseServiceImpl<Long, SysCouponCod
         if (StringUtils.isNotBlank(useCondition.getOrganId())) {
             List<String> organIdList = Arrays.asList(useCondition.getOrganId().split(","));
             if (!organIdList.contains(sysUser.getOrganId().toString())) {
-                throw new BizException("优惠券不属于当前分部");
+                throw new BizException("学生不在优惠券适用分部");
             }
 
         }

mec-biz/src/main/java/com/ym/mec/biz/service/impl/SysMusicScoreServiceImpl.java

@@ -331,7 +331,7 @@ public class SysMusicScoreServiceImpl extends BaseServiceImpl<Integer, SysMusicS
 
             FileUtil.inputStreamToFile(conn.getInputStream(), tempFile);
 
-            String script = "ffmpeg -i " + tempFileName + " -vn -c:a libmp3lame -b:a 192k -ac 2 " + tempTranscodFileName;
+            String script = "ffmpeg -i " + tempFileName + " -vn -c:a libmp3lame -b:a 320k -ac 2 " + tempTranscodFileName;
             int i = ScriptUtil.callScript(script);
             if (i == 0) {
                 //转码成功