Merge remote-tracking branch 'origin/developer' into developer

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

@@ -117,8 +117,8 @@ public class WxEnterpriseRelatedServiceImpl implements WxEnterpriseRelatedServic
                 settFlag = false ;
             }
         }
-        if(openCardFlag == 0 && wxEnterpriseType ==0 && !settFlag)  {
-            return true ;
+        if(openCardFlag == 0 && wxEnterpriseType ==0 && settFlag)  {
+            return false ;
         }
         return true ;
     }