bug对应，加本地开发分支

svr/svr-wlyy-health-bank/src/main/java/com/yihu/jw/controller/ActivityController.java

@@ -299,9 +299,9 @@ public class ActivityController extends EnvelopRestEndpoint {
            }
            if (null != status && "2".equals(status) ) {
                stringBuffer.append("status>1;").append("status<0;");
                stringBuffer.append("status=-1,2;");
            } else if (null != status && "1".equals(status) ) {
                stringBuffer.append("status>=0;").append("status<2;");
                stringBuffer.append("status=0,1;");
            }
            if(null!=crowdType&&StringUtils.isNotBlank(crowdType)){
                stringBuffer.append("crowdType="+crowdType+";");

svr/svr-wlyy-health-bank/src/main/resources/application.yml

@@ -81,6 +81,38 @@ spring:
fastDFS:
  fastdfs_file_url: http://172.19.103.54:80/
---
spring:
  profiles: devtest
  datasource:
    url: jdbc:mysql://172.19.103.85:3306/wlyy_health_bank?useUnicode=true&characterEncoding=utf-8&autoReconnect=true
    username: linzhou
    password: linzhou
  redis:
    host: 172.19.103.88 # Redis server host.
    port: 6379 # Redis server port.
#    password: jkzl_ehr
  data:
    elasticsearch: #ElasticsearchProperties
      cluster-name: jkzl #默认即为elasticsearch  集群名
      cluster-nodes: 172.19.103.68:9300 #配置es节点信息，逗号分隔，如果没有指定，则启动ClientNode
      local: false #是否本地连接
      properties: # Additional properties used to configure the client.
        enable: true
  # JEST (Elasticsearch HTTP client) (JestProperties)
  elasticsearch:
    jest:
      uris: http://172.19.103.68:9200
#      uris: [图片]http://172.19.103.68:9200
      connection-timeout: 60000 # Connection timeout in milliseconds.
      multi-threaded: true # Enable connection requests from multiple execution threads.
      username: # Login user.
      password: # Login password.
      proxy.port:  # Proxy port the HTTP client should use.
      proxy.host:  # Proxy host the HTTP client should use.
fastDFS:
  fastdfs_file_url: http://172.19.103.54:80/
---
spring:
  profiles: jwtest

svr/svr-wlyy-health-bank/src/main/resources/bootstrap.yml

@@ -15,6 +15,14 @@ spring:
      uri: ${wlyy.spring.config.uri:http://172.17.110.212:1221}
      label: ${wlyy.spring.config.label:jwdev}
---
spring:
  profiles: devtest
  cloud:
    config:
      uri: ${wlyy.spring.config.uri:http://172.17.110.212:1221}
      label: ${wlyy.spring.config.label:jwdev}
---
spring:
  profiles: jwtest