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

zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/service/impl/ClassGradeUserServiceImpl.java

@@ -574,7 +574,6 @@ public class ClassGradeUserServiceImpl extends ServiceImpl<ClassGradeUserMapper,
         if (Validator.isEmpty(orderGoods)) {
             return "班级商品不存在";
         }
-        
         Long bmrq = 0L;
         if(userVo.getClassStartTime().longValue()<orderGoods.getCreateTime().longValue()){
             bmrq = orderGoods.getCreateTime();