Merge branch 'dev' into 'master'

1.暂时关闭看看卫健群推送

See merge request !22

src/main/java/com/weface/component/GeTuiService.java

@@ -300,6 +300,9 @@ public class GeTuiService {
     public CommonResult listPush(InformForm informForm) {
         try {
             String type = informForm.getEquipmentType();
+            if ("kkwj".equals(type)){
+                return CommonResult.success("暂未开放推送");
+            }
             String appId = getAppId(type);
             String pushToken = getPushToken(type);
             if (StringUtils.isBlank(pushToken)) {