Commit 4e376f6b by zhiwj

Merge branch 'developer' into 'master'

Developer

See merge request !55
parents 9ac82477 1b669aa2
...@@ -65,7 +65,7 @@ public class IndexDescDTO implements Serializable { ...@@ -65,7 +65,7 @@ public class IndexDescDTO implements Serializable {
private Integer indexId; private Integer indexId;
private String remark; private String remark;
private Integer seq; private Integer seq = 0;
public Integer getIndexDescId() { public Integer getIndexDescId() {
return indexDescId; return indexDescId;
......
...@@ -95,6 +95,7 @@ public class StoreSearchUtils { ...@@ -95,6 +95,7 @@ public class StoreSearchUtils {
tempStoreIdList = this.storeWidgetApiService.listStoreInfoIdByStoreWidgetId(enterpriseId, tempStoreId).getResult(); tempStoreIdList = this.storeWidgetApiService.listStoreInfoIdByStoreWidgetId(enterpriseId, tempStoreId).getResult();
} }
final List<Integer> tempStoreIdListf = tempStoreIdList; final List<Integer> tempStoreIdListf = tempStoreIdList;
log.info("tempStoreIdList:{}", JSON.toJSONString(tempStoreIdListf));
if(StringUtils.isNotBlank(searchJson)){ if(StringUtils.isNotBlank(searchJson)){
JSONObject json = JSON.parseObject(searchJson); JSONObject json = JSON.parseObject(searchJson);
StoreSearchQo storeSearchQo = json.getObject(StoreChannelEnum.OFFLINE.getChannel().toString(), StoreSearchQo.class); StoreSearchQo storeSearchQo = json.getObject(StoreChannelEnum.OFFLINE.getChannel().toString(), StoreSearchQo.class);
......
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