Merge remote-tracking branch 'origin/master'

pmapi/src/main/java/com/ningdatech/pmapi/scheduler/task/CommonLogTask.java

@@ -89,9 +89,9 @@ public class CommonLogTask {
                commonLog.setUserRole("政府工作人员");
                commonLog.setAreaCode(userInfo.getRegionCode());
                String description = optLog.getDescription();
-               if ("登陆".equals(description)){
+               if ("用户登录".equals(description)){
                    commonLog.setActionType(1);
-               }else if ("退出登陆".equals(description)){
+               }else if (description.contains("退出登录")){
                    commonLog.setActionType(2);
                }else {
                    commonLog.setActionType(3);