diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/controller/YxScoreController.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/controller/YxScoreController.java
index 3c48c2c..db32264 100644
--- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/controller/YxScoreController.java
+++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/controller/YxScoreController.java
@@ -79,6 +79,9 @@ public class YxScoreController {
         AssertUtils.notTrue(culturalScore.compareTo(YxConstant.bigDecimal750) > 0, "[文化成绩]最高分为750");
         AssertUtils.notTrue(culturalScore.compareTo(YxConstant.bigDecimal0) < 0, "[文化成绩]最低分为0");
 
+        if (professionalScore == null) {
+            professionalScore = YxConstant.bigDecimal0;
+        }
         if ("音乐类".equals(professionalCategory)) {
             AssertUtils.notTrue(professionalScore.compareTo(YxConstant.bigDecimal300) > 0, "[主项成绩]最高分为300");
             AssertUtils.notTrue(professionalScore.compareTo(YxConstant.bigDecimal0) < 0, "[主项成绩]最低分为0");
diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/controller/YxVipCardController.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/controller/YxVipCardController.java
index 3cc2c0f..bf2e41b 100644
--- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/controller/YxVipCardController.java
+++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/controller/YxVipCardController.java
@@ -112,6 +112,9 @@ public class YxVipCardController extends JeecgController<YxVipCard, IYxVipCardSe
 		LambdaUpdateWrapper<YxVipCard> lambdaUpdateWrapper = new LambdaUpdateWrapper<>();
 		lambdaUpdateWrapper.eq(YxVipCard::getId,yxVipCard.getId());
 		lambdaUpdateWrapper.set(YxVipCard::getCardNum,yxVipCard.getCardNum());
+		lambdaUpdateWrapper.set(YxVipCard::getValidTime,yxVipCard.getValidTime());
+		lambdaUpdateWrapper.set(YxVipCard::getValidDate,yxVipCard.getValidDate());
+		lambdaUpdateWrapper.set(YxVipCard::getSkuCode, yxVipCard.getSkuCode());
 		yxVipCardService.update(lambdaUpdateWrapper);
 		//yxVipCardService.updateById(yxVipCard);
 		return Result.OK("编辑成功!");
diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/entity/YxVipCard.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/entity/YxVipCard.java
index d4e7df1..2817661 100644
--- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/entity/YxVipCard.java
+++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/entity/YxVipCard.java
@@ -50,9 +50,9 @@ public class YxVipCard implements Serializable {
     @ApiModelProperty(value = "有效时长(天)")
     private Integer validTime;
 	/**有效期至*/
-	@Excel(name = "有效期至", width = 15, format = "yyyy-MM-dd")
-	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
-    @DateTimeFormat(pattern="yyyy-MM-dd")
+	@Excel(name = "有效期至", width = 15, format = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty(value = "有效期至")
     private java.util.Date validDate;
     /**使用时间*/
diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/impl/YxCalculationMajorServiceImpl.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/impl/YxCalculationMajorServiceImpl.java
index 5367c17..5e4bc6e 100644
--- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/impl/YxCalculationMajorServiceImpl.java
+++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/impl/YxCalculationMajorServiceImpl.java
@@ -62,6 +62,10 @@ public class YxCalculationMajorServiceImpl extends ServiceImpl<YxCalculationMajo
             QueryRecommendMajorVO queryRecommendMajorVO = new QueryRecommendMajorVO();
             queryRecommendMajorVO.setProfessionalCategory(userScore.getProfessionalCategory()); // 专业类别
             queryRecommendMajorVO.setCognitioPolyclinic(userScore.getCognitioPolyclinic()); // 文理分科
+            if (("音乐类".equals(userScore.getProfessionalCategory()) ||
+                    "表演类".equals(userScore.getProfessionalCategory())) && StringUtils.isNotBlank(userScore.getProfessionalCategoryChildren())) {
+                queryRecommendMajorVO.setPCategoryChildrenList(Arrays.asList(userScore.getProfessionalCategoryChildren().split(",")));
+            }
             long startTime = new Date().getTime();
             recommendMajorDTOList = yxSchoolMajorMapper.recommendMajorList(queryRecommendMajorVO);  // 获取到当前专业，文/理科的数据
             //将历史录取信息合并到专业信息里