Merge remote-tracking branch 'origin/master'

luodangjia

2024-11-28 06f455915bb9d11caa8829942f9007809ee9ae3d

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

@@ -1,8 +1,8 @@
package com.ruoyi.other.controller;

import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.ruoyi.common.core.web.domain.AjaxResult;
import com.ruoyi.other.api.model.Agreement;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.other.api.domain.Agreement;
import com.ruoyi.other.service.IAgreementService;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
@@ -34,8 +34,8 @@
   @ApiImplicitParams({
         @ApiImplicitParam(value = "类型（1=用户协议，2=隐私协议，3=技师上门免责声明，4=注销协议，5门店提现免责声明）", name = "type", required = true, dataType = "int"),
   })
   public AjaxResult<String> getAgreement(@PathVariable("type") Integer type){
   public R<String> getAgreement(@PathVariable("type") Integer type){
      Agreement one = agreementService.getOne(new LambdaQueryWrapper<Agreement>().eq(Agreement::getType, type));
      return AjaxResult.success(null == one ? "" : one.getContent());
      return R.ok(null == one ? "" : one.getContent());
   }
}