Merge remote-tracking branch 'origin/master'

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

@@ -44,7 +44,7 @@ public class StudentGoodsSell {
 	private Boolean isUseBalancePayment = false;
 
 	@ApiModelProperty(value = "是否重复支付",required = true)
-	private boolean isRepeatPay;
+	private boolean isRepeatPay = false;
 
 	@ApiModelProperty(value = "商品列表",required = true)
 	private List<GoodsSellDto> goodsSellDtos;

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

@@ -3114,7 +3114,7 @@
         WHERE cs.class_group_id_ = #{classGroupId}
         AND TIMESTAMPDIFF(MINUTE, CONCAT(cs.class_date_," ",cs.end_class_time_),#{startTime}) <= #{continueCourseTime}
         AND TIMESTAMPDIFF(MINUTE, CONCAT(cs.class_date_," ",cs.end_class_time_),#{startTime}) >= 0
-        AND cs.actual_teacher_id_ = #{teacherId} AND (ta.sign_in_time_ IS NOT NULL OR sa.id_ IS NOT NULL)
+        AND cs.actual_teacher_id_ = #{teacherId}
         ORDER BY cs.class_date_ DESC,cs.end_class_time_ DESC
         LIMIT 1
     </select>

mec-thirdparty/src/main/java/com/ym/mec/thirdparty/user/realname/provider/LinkfaceRealnameAuthenticationPlugin.java

@@ -87,7 +87,7 @@ public class LinkfaceRealnameAuthenticationPlugin implements RealnameAuthenticat
 			String msg = "";
 			if (result != null) {
 				if (result == 2) {
-					msg = "身份证号和姓名不⼀致";
+					msg = "身份证号和姓名不一致";
 				} else if (result == 3) {
 					msg = "查无此身份证号";
 				}