DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/DriverController.java
@@ -1597,7 +1597,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); DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/rongyun/RongYunUtil.java
@@ -18,14 +18,14 @@ @Component public class RongYunUtil { // public static String app_key = "bmdehs6pbnozs"; // public static String app_secret = "RovVwtABN1"; public static String app_key = "bmdehs6pbnozs"; public static String app_secret = "RovVwtABN1"; @Value("${rongyun.app_key}") private String app_key; @Value("${rongyun.app_secret}") private String app_secret; // @Value("${rongyun.app_key}") // private String app_key; // // @Value("${rongyun.app_secret}") // private String app_secret; /** * 注册获取token * @param userId
