Merge branch 'dev' of lyr/patient-co-management into dev

patient-co-analysis/src/main/java/com/yihu/wlyy/analysis/etl/LogDataTransform.java

@@ -20,7 +20,7 @@ public class LogDataTransform {
    // 日志提取分析类集合
    private Map<String, ILogTransform> transforms = new HashMap<>();
    private LogDataTransform instance;
    private static LogDataTransform instance;
    private static Object obj = new Object();

patient-co-analysis/src/main/java/com/yihu/wlyy/analysis/etl/util/IdcardUtil.java

@@ -1,4 +1,4 @@
package com.yihu.wlyy.analysis.etl.util;
package com.yihu.wlyy.analysis.util;
import org.apache.commons.lang3.StringUtils;