Merge branch 'developer' into 'master'

测试

See merge request !65

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/controller/WxEnterpriseController.java

@@ -321,7 +321,7 @@ public class WxEnterpriseController extends WebBaseController{
 		}
 		EnterpriseDTO enterprise = enterpriseService.getEnterpriseByEid(enterpriseId);
 		if(enterprise == null || enterprise.getExpireTime() == null){
-			return resultResponse(HaoBanErrCode.ERR_1,true);
+			return resultResponse(HaoBanErrCode.ERR_1,false);
 		}
 		if(enterprise.getExpireTime().getTime() > System.currentTimeMillis()){
 			return resultResponse(HaoBanErrCode.ERR_1,false);