Merge branch 'master_xgh_pendingid' into 'developer'

test

See merge request !311

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

@@ -232,7 +232,7 @@ public class QwFriendApiServiceImpl implements QwFriendApiService {
                 EnterpriseServiceEnum.HAO_BAN.getRightMenuCode());
         log.info("好办是否到期停用={},{}", enterpriseId, code);
         if (code != 0 && code != 1) {
-            return ServiceResponse.failure(HaoBanErrCode.ERR_2010.getCode(), "商户已停用");
+            return ServiceResponse.failure(HaoBanErrCode.ERR_2010.getCode(), "好办未启用或已停用");
         }
         int memberOpenCardlag = enterpriseRelation.getMemberOpenCardFlag();
         if (memberOpenCardlag != 0) {