conflict

Helius

2020-08-06 ad4774eff562d52b2677cfbcf8e55b8506d57891

 src/main/java/com/xcong/excoin/modules/documentary/controller/DocumentaryController.java

@@ -155,9 +155,9 @@
   /**

    *  跟单---跟单设置

    */

   @ApiOperation(value="跟单---跟单设置", notes="跟单---跟单设置")

   @PostMapping(value = "/getDocumentaryOrderSet")

   public Result  getDocumentaryOrderSet(@RequestBody @Valid DocumentaryOrderSetDto documentaryOrderSetDto) {

   @ApiOperation(value="跟单---跟单设置--新增跟单", notes="跟单---跟单设置--新增跟单")

   @PostMapping(value = "/addDocumentaryOrderSet")

   public Result  addDocumentaryOrderSet(@RequestBody @Valid DocumentaryOrderSetDto documentaryOrderSetDto) {

      return documentaryService.getDocumentaryOrderSet(documentaryOrderSetDto);

   }