Merge branch 'dev_bugfix_ljj'

epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/project/ProjectProcessDao.xml

@@ -4,7 +4,7 @@
 <mapper namespace="com.epmet.dao.project.ProjectProcessDao">
 
     <select id="selectProcessList" resultType="com.epmet.entity.project.ProjectProcessEntity">
-        SELECT
+        SELECT DISTINCT
             pro.project_id AS "projectId",
             pro.operation AS "operation",
             DATE_FORMAT(pro.created_time, "%Y-%m-%d") AS "createdTime",

epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/WxmpMessageServiceImpl.java

@@ -544,7 +544,7 @@ public class WxmpMessageServiceImpl implements WxmpMessageService {
                 throw new WxSubscribeException("clientType有误", "", openId);
             }
         } catch (Exception e) {
-            log.error("method exception", e);
+            log.warn("method exception,msg:{}", e.getMessage());
             throw new WxSubscribeException("获取openId失败:" + e.getMessage(), "", "");
         }
         return openId;