java/QianYunTong.git

			@@ -1606,7 +1606,7 @@
			if(companyCities.isEmpty()){
			return ResultUtil.success(companyVos);
			}
			Wrapper<Company> in = new EntityWrapper<Company>().ne("type", 1).ne("flag", 3).in("id", companyCities.stream().map(CompanyCity::getCompanyId).collect(Collectors.toList()));
			Wrapper<Company> in = new EntityWrapper<Company>().eq("type", 2).ne("flag", 3).in("id", companyCities.stream().map(CompanyCity::getCompanyId).collect(Collectors.toList()));

			if(ToolUtil.isNotEmpty( name)){
			in.like("name", name);
			@@ -1832,8 +1832,15 @@
			@ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9....."),
			@ApiImplicitParam(value = "当前设备IP地址", name = "ip", required = true, dataType = "String"),
			@ApiImplicitParam(value = "当前设备mac地址", name = "mac", required = true, dataType = "String"),
			@ApiImplicitParam(value = "01 证联收银台支付\n" +
			"\t 04 HOME 页\n" +
			"\t 06 申请免密签约\n" +
			"\t 07 商户收银台支付\n" +
			"\t 08 开户（绑卡）\n" +
			"\t 09 开通支付账户\n" +
			"\t 10 打开付款码", name = "type", required = true, dataType = "String"),
			})
			public ResultUtil<String> getZLToken(String ip, String mac, HttpServletRequest request){
			public ResultUtil<String> getZLToken(String ip, String mac, String type, HttpServletRequest request){
			try {
			Integer driverId = driverService.getUserIdFormRedis(request);
			if (null == driverId) {
			@@ -1850,6 +1857,7 @@
			tradeTerminalInfo.setTerminal("1");
			tradeTerminalInfo.setMac(mac);
			tokenRequest.setTradeTerminalInfo(tradeTerminalInfo);
			tokenRequest.setType(type);
			String token = TokenUtil.getToken(tokenRequest);
			return ResultUtil.success(token);
			}catch (Exception e){