diff --git a/admin-pc/.env.production b/admin-pc/.env.production index 79488da..bad4239 100644 --- a/admin-pc/.env.production +++ b/admin-pc/.env.production @@ -1,5 +1,5 @@ NODE_ENV=production # VUE_APP_API_BASE_URL=http://localhost:8081/recycle-admin-v2/ -VUE_APP_API_BASE_URL=https://www.ddmhs.top/recycle-admin-v2/ +VUE_APP_API_BASE_URL=https://wwwv2.ddmhs.top/recycle-admin-v2/ VUE_APP_CAS_BASE_URL=http://localhost:8888/cas VUE_APP_ONLINE_BASE_URL=http://fileview.jeecg.com/onlinePreview \ No newline at end of file diff --git a/admin-pc/dist.zip b/admin-pc/dist.zip index f949aba..64cbc83 100644 Binary files a/admin-pc/dist.zip and b/admin-pc/dist.zip differ diff --git a/module-common/src/main/java/org/jeecg/api/service/impl/AppletClassServiceImpl.java b/module-common/src/main/java/org/jeecg/api/service/impl/AppletClassServiceImpl.java index ec31142..cbe9fad 100644 --- a/module-common/src/main/java/org/jeecg/api/service/impl/AppletClassServiceImpl.java +++ b/module-common/src/main/java/org/jeecg/api/service/impl/AppletClassServiceImpl.java @@ -100,8 +100,8 @@ public class AppletClassServiceImpl implements AppletClassService { @Override public Result getGoodsBrandProduct(String productId, String brandId) { return Result.ok(commonBrandProductService.lambdaQuery() -// .eq(CommonBrandProduct::getBrandId, brandId) -// .eq(CommonBrandProduct::getShopId, productId) + .eq(CommonBrandProduct::getBrandId, brandId) + .eq(CommonBrandProduct::getShopId, productId) .list()); }