|
|
@@ -71,7 +71,8 @@ public class GoodsController extends BaseController {
|
|
|
@GetMapping("/my")
|
|
|
public List<Goods> my() {
|
|
|
Long merchantId = merchantService.findMerchantId(SecurityUtils.getAuthenticatedUser().getId());
|
|
|
- return goodsRepo.findAllByMerchantIdAndIsPassTrue(merchantId);
|
|
|
+ return goodsRepo.findAllByMerchantId(merchantId);
|
|
|
+ //return goodsRepo.findAllByMerchantIdAndIsPassTrue(merchantId);
|
|
|
}
|
|
|
|
|
|
@GetMapping("/take")
|