Merge branch 'develop' into release

tuoheng-admin/src/main/java/com/tuoheng/admin/service/impl/MissionServiceImpl.java

@@ -191,7 +191,6 @@ public class MissionServiceImpl extends BaseServiceImpl<ThMissionMapper, ThMissi
             //开始分析
             try {
                 JSONObject jsonObject  = startAI(missionStatusRequest);
-                thMissionUpdate.setTenantId(ShiroUtils.getTenantId());//xz
                 thMissionUpdate.setRequestId(jsonObject.getJSONObject("data").getString("requestId"));
                 thMissionUpdate.setAipullUrl(jsonObject.getJSONObject("data").getString("aipullUrl"));
                 thMissionUpdate.setAipushUrl(jsonObject.getJSONObject("data").getString("aipushUrl"));

tuoheng-admin/src/main/java/com/tuoheng/admin/service/impl/QuestionServiceImpl.java

@@ -73,23 +73,6 @@ public class QuestionServiceImpl extends BaseServiceImpl<QuestionMapper, Questio
 
     private final static SimpleDateFormat dateformat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 
-//    @Override
-//    public JsonResult deleteByIds(Integer[] ids) {
-//        if (org.springframework.util.StringUtils.isEmpty(ids)) {
-//            return JsonResult.error("记录ID不能为空");
-//        }
-////        String[] item = ids.split(",");
-//        // 设置Mark=0
-//        UpdateWrapper updateWrapper = new UpdateWrapper();
-//        updateWrapper.set("mark", 0);
-//        updateWrapper.in("id", ids);
-//        boolean result = update(updateWrapper);
-//        if (!result) {
-//            return JsonResult.error();
-//        }
-//        return JsonResult.success("删除成功");
-//    }
-
     @Override
     @Transactional(readOnly = true)
     public IPage<QuestionVO> queryPage(QuestionQuery query) throws ParseException {