Merge branch 'master' into docker_package

renren-admin/src/main/java/io/renren/common/aspect/ActivitiNoticeAspect.java

@@ -95,6 +95,7 @@ public class ActivitiNoticeAspect {
                             task_complete_notice(delegateTask, activitiNoticeOperation);
                             break;
                         default:
+                            break;
                     }
                 });
             } // 任务监听器类型
@@ -323,7 +324,7 @@ public class ActivitiNoticeAspect {
     private void assignment_notice(final DelegateTask delegateTask, final ActivitiNoticeOperation activitiNoticeOperation) {
         Map<String, Object> kv = delegateTask.getVariables();
         LOGGER.error("表单：{}", JSON.toJSONString(kv));
-        if(delegateTask.getId().equals(kv.get("autoApply"))){
+        if (delegateTask.getId().equals(kv.get("autoApply"))) {
             LOGGER.error("------------自动审批通过，不通知------------");
             return;
         }