|
|
@@ -120,7 +120,7 @@ public class GoodsDescController extends BladeController {
|
|
|
lambdaQueryWrapper.select(PjGoodsDesc::getId, PjGoodsDesc::getCname, PjGoodsDesc::getCode, PjGoodsDesc::getSpecificationAndModel, PjGoodsDesc::getBrandItem,
|
|
|
PjGoodsDesc::getBrandName, PjGoodsDesc::getGoodsSize, PjGoodsDesc::getInventoryAlert, PjGoodsDesc::getGoodsDescription,
|
|
|
PjGoodsDesc::getStatus, PjGoodsDesc::getEnableOrNot,PjGoodsDesc::getUnit,PjGoodsDesc::getIntegral,PjGoodsDesc::getWhether
|
|
|
- ,PjGoodsDesc::getWhetherIntegral)
|
|
|
+ ,PjGoodsDesc::getWhetherIntegral, PjGoodsDesc::getBrandId, PjGoodsDesc::getGoodsTypeId)
|
|
|
.eq(PjGoodsDesc::getTenantId, AuthUtil.getTenantId())
|
|
|
.eq(PjGoodsDesc::getIsDeleted, 0)
|
|
|
.eq(PjGoodsDesc::getSalesCompanyId, AuthUtil.getDeptId())//公司
|