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

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/service/message/BaseServiceNewsService.java

@@ -198,7 +198,7 @@ public class BaseServiceNewsService {
            String relationCode = tmp.getRelationCode();
            if (StringUtils.isNotBlank(relationCode)){
                if ("1".equals(tmp.getType())){//上门
                   String sql = " select group_concat(Distinct fee.name SEPARATOR '、') from base_door_coach_fee_detail where  order_id ='"+relationCode+"' and status =1 ";
                   String sql = " select group_concat(Distinct name SEPARATOR '、') from base_door_coach_fee_detail where  order_id ='"+relationCode+"' and status =1 ";
                   List<String> serviceItems = jdbcTemplate.queryForList(sql,String.class);
                   if (serviceItems.size()>0){
                       tmp.setServeItems(serviceItems.get(0));

svr/svr-statistics-es/doc/es/命令建索引.txt

@@ -18,3 +18,6 @@ PUT  http://172.26.0.112:9200/wlyy_quota_test/_settings
    "max_result_window": 500000
  }
}
curl -XGET 'http://10.18.43.40:9200/hlw_quota_prod'