Merge branch 'feature-game2' into developer

# Conflicts:
#	haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/impl/StaffClerkRelationServiceImpl.java
#	haoban-manage3-service/src/test/java/GroupMessageServiceTest.java
#	haoban-manage3-service/src/test/java/NotityTest.java

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/impl/SecretSettingServiceImpl.java

@@ -73,6 +73,9 @@ public class SecretSettingServiceImpl implements SecretSettingService {
             return null;
         }
         WxEnterpriseQwDTO qwDTO = this.wxEnterpriseService.getQwInfo(wxEnterpriseId) ;
+        if (qwDTO == null) {
+            return null;
+        }
         // 如果是纯自建,使用自建的token
         if(qwDTO.isSelf()) {
             secretType = SecretTypeEnum.SELF_APP.getVal() ;