Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/mx_charg...

Pu Zhibing

2024-10-22 707e75fddf2e4c63d72c6c40b49c3dfa9cb0bb65

 ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TGoodsController.java

@@ -129,13 +129,13 @@
        if (goodType==1){
        TGoods byId = goodsService.getById(id);
        if (byId==null||byId.getStatus()==2){
            return R.fail(2,"内容不存在");
            return R.fail(2,"该商品已不存在");
        }
        return R.ok(byId);}
        else {
            TCoupon byId = couponService.getById(id);
            if (byId==null||byId.getStatus()==2){
                return R.fail(2,"内容不存在");
                return R.fail(2,"该商品已不存在");
            }
            return R.ok(byId);
    }