|
@@ -3,8 +3,8 @@ package cn.com.ctop.common.module.service.impl;
|
|
import cn.com.ctop.common.module.entity.KuaiShouOcpxActionTypeConfig;
|
|
import cn.com.ctop.common.module.entity.KuaiShouOcpxActionTypeConfig;
|
|
import cn.com.ctop.common.module.mapper.KuaiShouOcpxActionTypeConfigMapper;
|
|
import cn.com.ctop.common.module.mapper.KuaiShouOcpxActionTypeConfigMapper;
|
|
import cn.com.ctop.common.module.service.IKuaiShouOcpxActionTypeConfigService;
|
|
import cn.com.ctop.common.module.service.IKuaiShouOcpxActionTypeConfigService;
|
|
|
|
+import com.alibaba.fastjson.JSONObject;
|
|
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
|
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
|
-import net.sf.json.JSONObject;
|
|
|
|
import org.jeecg.common.api.vo.Result;
|
|
import org.jeecg.common.api.vo.Result;
|
|
import org.springframework.stereotype.Service;
|
|
import org.springframework.stereotype.Service;
|
|
|
|
|
|
@@ -23,8 +23,8 @@ public class KuaiShouOcpxActionTypeConfigServiceImpl extends ServiceImpl<KuaiSho
|
|
@Override
|
|
@Override
|
|
public Result<Object> bytedanceList() {
|
|
public Result<Object> bytedanceList() {
|
|
JSONObject data = new JSONObject();
|
|
JSONObject data = new JSONObject();
|
|
- List<KuaiShouOcpxActionTypeConfig> conversionType = baseMapper.bytedanceList(1);
|
|
|
|
- List<KuaiShouOcpxActionTypeConfig> deepConversionType = baseMapper.bytedanceList(2);
|
|
|
|
|
|
+ List<JSONObject> conversionType = baseMapper.bytedanceList(1);
|
|
|
|
+ List<JSONObject> deepConversionType = baseMapper.bytedanceList(2);
|
|
data.put("conversionType", conversionType);
|
|
data.put("conversionType", conversionType);
|
|
data.put("deepConversionType", deepConversionType);
|
|
data.put("deepConversionType", deepConversionType);
|
|
return Result.ok(data);
|
|
return Result.ok(data);
|