Merge branch 'dev' of http://192.168.1.220:10080/jiwei/wlyy2.0 into dev

Conflicts:
	svr/svr-base/src/main/java/com/yihu/jw/base/endpoint/servicePackage/ServicePackageEndpoint.java

common/common-request-mapping/src/main/java/com/yihu/jw/rm/base/BaseRequestMapping.java

@@ -159,6 +159,13 @@ public class BaseRequestMapping {
        public static final String PREFIX  = "/service_package";
    }
    /**
     * 服务包类目
     */
    public static class ServicePackageNormcat extends Basic{
        public static final String PREFIX  = "/service_package_normcat";
    }
    /**
     * 康复计划
     */

svr/svr-statistics/doc/es/QuartzJobConfig.java

@@ -2,8 +2,6 @@ package com.yihu.wlyy.entity.job;
import org.hibernate.annotations.GenericGenerator;
import javax.persistence.*;
/**
 * 计划任务
 */

svr/svr-statistics/src/main/java/com/yihu/wlyy/statistics/etl/save/SaveHelper.java

@@ -1,6 +1,6 @@
package com.yihu.wlyy.statistics.etl.save;
import com.yihu.wlyy.statistics.etl.save.es.ElastricSearchSave;
import com.yihu.wlyy.statistics.etl.save.es.ElasticSearchSave;
import com.yihu.wlyy.statistics.util.SpringUtil;
import com.yihu.wlyy.statistics.vo.SaveModel;
import org.springframework.context.annotation.Scope;
@@ -16,13 +16,13 @@ import java.util.List;
public class SaveHelper {
    public Boolean save(List<SaveModel> sms) {
        return SpringUtil.getBean(ElastricSearchSave.class).save(sms);
        return SpringUtil.getBean(ElasticSearchSave.class).save(sms);
    }
    public Boolean update(List<SaveModel> sms) {
        return SpringUtil.getBean(ElastricSearchSave.class).update(sms);
        return SpringUtil.getBean(ElasticSearchSave.class).update(sms);
    }