Merge branch 'master' of ssh://120.76.84.145:20202/java/HongRuiTang into ma...

jiangqs

2023-09-18 3ca15fea872010606b5b96a4c11d0d6409dd0be7

Merge branch 'master' of ssh://120.76.84.145:20202/java/HongRuiTang into master

 ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/business/MerConsumerController.java

@@ -14,6 +14,7 @@
import com.ruoyi.order.service.order.UserServiceRecordService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.log4j.Log4j2;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
@@ -32,6 +33,7 @@
@Api(value = "商户端服务相关接口", tags = "商户端服务相关接口", description = "商户端服务相关接口")
@RestController
@RequestMapping("/mer/consumer")
@Log4j2
public class MerConsumerController {

    @Resource