Merge remote-tracking branch 'origin/master'

puzhibing

2023-11-28 d643b843cc794d8f59c4ecd04bda2b9d35e5b22a

 cloud-server-course/src/main/java/com/dsh/course/service/impl/CoursePackageOrderStudentServiceImpl.java

@@ -132,7 +132,7 @@
                    String[] split = classWeeks.split(";");
                    List<String> integerList = Arrays.asList(split);
                    String weekOfDate = DateTimeHelper.getWeekOfDate(new Date());
                    if (integerList.contains(weekOfDate)) {
//                    if (integerList.contains(weekOfDate)) {
                        String dat = simpleDateFormat.format(byId.getClassDate()) + " " + dateString1.substring(11);

                        Date start = null;
@@ -171,9 +171,9 @@
                                }
                            }
                        }
                    } else {
                        recordVo.setStatus(1);
                    }
//                    } else {
//                        recordVo.setStatus(1);
//                    }
                    recordVoList.add(recordVo);
                }