submit：BUG处理

zhongzheng-system/src/main/java/com/zhongzheng/modules/exam/bo/ExamActivityUserVo.java

@@ -37,7 +37,7 @@ public class ExamActivityUserVo implements Serializable {
     private String companyName;
     /** 用户身份证号码 */
     @ApiModelProperty("用户身份证号码")
-    @Excel(name = "用户身份证号码")
+//    @Excel(name = "用户身份证号码")
     private String userIdCard;
     /** 用户手机号码 */
     @ApiModelProperty("用户手机号码")
@@ -51,8 +51,10 @@ public class ExamActivityUserVo implements Serializable {
     @ApiModelProperty("科目IDs")
     private String mockSubjectIds;
     @ApiModelProperty("专业名称")
+    @Excel(name = "报考专业")
     private String mockMajorName;
     @ApiModelProperty("科目名称（多个按逗号隔开）")
+    @Excel(name = "报考科目")
     private String mockSubjectNames;
 
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/exam/service/impl/ExamActivityServiceImpl.java

@@ -35,6 +35,7 @@ import com.zhongzheng.modules.user.domain.User;
 import com.zhongzheng.modules.user.service.IUserMockSubscribeService;
 import com.zhongzheng.modules.user.service.IUserService;
 import com.zhongzheng.modules.wx.service.IWxLoginService;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -193,8 +194,9 @@ public class ExamActivityServiceImpl extends ServiceImpl<ExamActivityMapper, Exa
             }
             if (ObjectUtils.isNotNull(item.getMockSubjectIds())){
                 List<CourseSubject> subjects = courseSubjectService.listByIds(Arrays.stream(item.getMockSubjectIds().split(",")).collect(Collectors.toList()));
-                String names = subjects.stream().map(CourseSubject::getSubjectName).collect(Collectors.joining());
-                item.setMockSubjectNames(names);
+//                String names = subjects.stream().map(CourseSubject::getSubjectName).collect(Collectors.joining());
+                List<String> names = subjects.stream().map(CourseSubject::getSubjectName).collect(Collectors.toList());
+                item.setMockSubjectNames(StringUtils.join(names, ","));
             }
         });
         return activityUserList;

zhongzheng-system/src/main/java/com/zhongzheng/modules/goods/service/impl/GoodsSpecTemplateServiceImpl.java

@@ -88,6 +88,7 @@ public class GoodsSpecTemplateServiceImpl extends ServiceImpl<GoodsSpecTemplateM
         lqw.eq(bo.getBusinessId() != null, GoodsSpecTemplate::getBusinessId, bo.getBusinessId());
         lqw.like(StrUtil.isNotBlank(bo.getName()), GoodsSpecTemplate::getName, bo.getName());
         lqw.eq(bo.getStatus() != null, GoodsSpecTemplate::getStatus, bo.getStatus());
+        lqw.orderByDesc(GoodsSpecTemplate::getCreateTime);
         List<GoodsSpecTemplateVo> vos = entity2Vo(this.list(lqw));
         if (CollectionUtils.isNotEmpty(vos)){
             vos.forEach(item -> {

zhongzheng-system/src/main/resources/mapper/modules/exam/ExamActivityMapper.xml

@@ -17,6 +17,7 @@
         <if test="name != null and name != ''">
             AND (ea.name like concat('%', #{name}, '%'))
         </if>
+        ORDER BY ea.create_time DESC
     </select>
 
     <select id="getActivityUserList" parameterType="java.lang.Long"