Merge branch 'feature/0529-live' of http://git.dayaedu.com/yonge/mec into feature/0529-live

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/SysCoupon.java

@@ -42,7 +42,7 @@ public class SysCoupon extends BaseEntity implements Serializable{
 	@ApiModelProperty("券类型:FULL_REDUCTION(满减券)，DISCOUNT(折扣券)")
 	private CouponTypeEnum type;
 
-    @NotBlank(message = "优惠券详细分类不能为空!")
+    //@NotNull(message = "优惠券详细分类不能为空!")
     @ApiModelProperty(value = "详情-CouponDetailTypeEnum-枚举类")
     private CouponDetailTypeEnum typeDetail;
 

mec-biz/src/main/java/com/ym/mec/biz/dal/enums/CouponDetailTypeEnum.java

@@ -1,5 +1,6 @@
 package com.ym.mec.biz.dal.enums;
 
+import com.ym.mec.common.enums.BaseEnum;
 import org.apache.commons.lang3.StringUtils;
 
 import java.util.ArrayList;
@@ -14,7 +15,7 @@ import java.util.stream.Collectors;
  * @author hgw
  * Created by 2021-12-29
  */
-public enum CouponDetailTypeEnum {
+public enum CouponDetailTypeEnum implements BaseEnum<String, CouponDetailTypeEnum> {
 
     //商品-其他类型优惠券
     OTHER("OTHER", "其他"),

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

@@ -681,7 +681,8 @@
             IF(sa.status_ IS NULL,'NORMAL',sa.status_) attendance_status_,
             csc.id_ IS NOT NULL complaint_status_,
             cs.teach_mode_,
-            cs.new_course_id_
+            cs.new_course_id_,
+            cs.group_type_
         FROM
             course_schedule_student_payment cssp
             LEFT JOIN course_schedule cs ON cssp.course_schedule_id_=cs.id_