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

mec-student/src/main/java/com/ym/mec/student/controller/ChildrenDayController.java

@@ -80,7 +80,7 @@ public class ChildrenDayController extends BaseController {
         degreePayDto.setOrganId(sysUser.getOrganId());
         degreePayDto.setUser(sysUser);
         List<ChildrenDayDegreeDetail> ingDetails = childrenDayDegreeDetailService.getByUserIdAndStatus(sysUser.getId(), 1);
-        if (ingDetails.size() > 0) {
+        if (!degreePayDto.getRePay() && ingDetails.size() > 0) {
             return failed(HttpStatus.CONTINUE, "您有待支付的订单");
         }