Commit 0f8b789b by jinxin

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

parents 5e7005c0 77e950ba
...@@ -225,7 +225,7 @@ public class TargetController { ...@@ -225,7 +225,7 @@ public class TargetController {
JSONObject jsonObject = getCommon(qo, true); JSONObject jsonObject = getCommon(qo, true);
Map<String, Object> res = DataTargetHttpUtils.http(DataTargetHttpUtils.getParamNoPage(jsonObject).toJSONString(), Map<String, Object> res = DataTargetHttpUtils.http(DataTargetHttpUtils.getParamNoPage(jsonObject).toJSONString(),
"data_mbr_target_store_mbr_631_detail"); "data_mbr_target_store_mbr_631_detail");
return DataTargetHttpUtils.response(res); return DataTargetHttpUtils.responseOfOne(res, null);
} }
private JSONObject getCommon(QueryDataStatisticsCommonQO qo, boolean app) { private JSONObject getCommon(QueryDataStatisticsCommonQO qo, boolean app) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment