Merge remote-tracking branch 'origin/master'

src/main/java/com/ghsc/partybuild/controller/exammanage/PlanController.java

@@ -83,10 +83,10 @@ public class PlanController {
         int count = 0;
         String message = "";
         try {
-            //考试安排使用时间*
-            if(new Date().compareTo(dateUtils.strToDateExt("2024-07-29"))>=0){
-                throw new Exception("java.lang.IllegalArgumentException: No converter found for return value of type: class cn.e3mall.pojo.TbItem");
-            }
+//            //考试安排使用时间*
+//            if(new Date().compareTo(dateUtils.strToDateExt("2024-07-29"))>=0){
+//                throw new Exception("java.lang.IllegalArgumentException: No converter found for return value of type: class cn.e3mall.pojo.TbItem");
+//            }
             Map<String, Object> userinfoExp= userService.extendUserPartyInfo(userService.getLoginUser().getUserid());
             count = planService.save(data.dataModel, data.userList, userService.getLoginUser().getUserid(), userService.getUserInfobyId(userService.getLoginUser().getUserid()),
                     userinfoExp.get("DZZDM").toString(), userinfoExp.get("DZZMC").toString());