Merge branch 'yonge' of http://git.dayaedu.com/yonge/mec into yonge

mec-biz/src/main/resources/config/mybatis/ClassGroupMapper.xml

@@ -445,6 +445,7 @@
     <select id="findAllClassGroupByMusicGroup" resultMap="ClassGroup">
         SELECT * FROM class_group cg
         WHERE cg.music_group_id_=#{musicGroupId} AND del_flag_ = '0'
+        AND cg.group_type_='MUSIC'
         <if test="classGroupType != null">
             AND cg.type_ = #{classGroupType}
         </if>

mec-web/src/main/java/com/ym/mec/web/controller/SysUserCashAccountController.java

@@ -57,16 +57,16 @@ public class SysUserCashAccountController extends BaseController {
 	@ApiOperation(value = "更新指定用户的账户课程余额")
 	@PostMapping("/updateCourseBalance")
 	@PreAuthorize("@pcs.hasPermissions('userCashAccount/updateCourseBalance')")
-	public Object updateCourseBalance(Integer userId, BigDecimal decimal) {
-		sysUserCashAccountService.updateCourseBalance(userId,decimal,decimal,"后台更新课程余额");
+	public Object updateCourseBalance(Integer userId, BigDecimal decimal, String memo) {
+		sysUserCashAccountService.updateCourseBalance(userId,decimal,decimal, memo);
 		return succeed();
 	}
 
 	@ApiOperation(value = "更新指定用户的账户可用余额")
 	@PostMapping("/updateBalance")
 	@PreAuthorize("@pcs.hasPermissions('userCashAccount/updateBalance')")
-	public Object updateBalance(Integer userId, BigDecimal decimal) {
-		sysUserCashAccountService.updateBalance(userId,decimal,FILL_ACCOUNT,"后台更新可用余额");
+	public Object updateBalance(Integer userId, BigDecimal decimal, String memo) {
+		sysUserCashAccountService.updateBalance(userId,decimal,FILL_ACCOUNT, memo);
 		return succeed();
 	}
 }