Merge remote-tracking branch 'origin/master'
This commit is contained in:
commit
6cb78e0749
|
|
@ -12,6 +12,7 @@ import io.swagger.annotations.ApiOperation;
|
||||||
import org.springframework.web.bind.annotation.*;
|
import org.springframework.web.bind.annotation.*;
|
||||||
|
|
||||||
import javax.annotation.Resource;
|
import javax.annotation.Resource;
|
||||||
|
import java.io.UnsupportedEncodingException;
|
||||||
import java.net.URL;
|
import java.net.URL;
|
||||||
import java.net.URLDecoder;
|
import java.net.URLDecoder;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
@ -37,7 +38,7 @@ public class BmContractController extends BaseController {
|
||||||
}
|
}
|
||||||
@ApiOperation(value = "合同新增")
|
@ApiOperation(value = "合同新增")
|
||||||
@PostMapping("/add")
|
@PostMapping("/add")
|
||||||
public AjaxResult add(@RequestBody BmContract bmContract) {
|
public AjaxResult add(@RequestBody BmContract bmContract) throws UnsupportedEncodingException {
|
||||||
/* String decode = URLDecoder.decode(bmContract.getContent());
|
/* String decode = URLDecoder.decode(bmContract.getContent());
|
||||||
decode = decode.replace("$", "$");
|
decode = decode.replace("$", "$");
|
||||||
bmContract.setContent(decode);*/
|
bmContract.setContent(decode);*/
|
||||||
|
|
@ -50,7 +51,7 @@ public class BmContractController extends BaseController {
|
||||||
}
|
}
|
||||||
@ApiOperation(value = "合同修改")
|
@ApiOperation(value = "合同修改")
|
||||||
@PostMapping("/edit")
|
@PostMapping("/edit")
|
||||||
public AjaxResult edit(@RequestBody BmContract bmContract) {
|
public AjaxResult edit(@RequestBody BmContract bmContract) throws UnsupportedEncodingException {
|
||||||
/* String decode = URLDecoder.decode(bmContract.getContent());
|
/* String decode = URLDecoder.decode(bmContract.getContent());
|
||||||
decode = decode.replace("$", "$");
|
decode = decode.replace("$", "$");
|
||||||
bmContract.setContent(decode);*/
|
bmContract.setContent(decode);*/
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue