Merge remote-tracking branch 'origin/master'

phpcjl

2024-11-25 5fad5b026148771b103a6eed0e46dfcad3ee24a0

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

@@ -26,7 +26,7 @@
 */
@RestController
@RequestMapping("/goods")
@Api("商品")
@Api(tags = "商品")
public class GoodsController extends BaseController {
    @Resource
    private GoodsService goodsService;