Merge remote-tracking branch 'origin/develop_master' into develop_1

# Conflicts:
#	adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/controller/SarStandardsInfoController.java
This commit is contained in:
zzy
2021-07-30 17:15:36 +08:00
2 changed files with 11 additions and 5 deletions
@@ -82,6 +82,12 @@ public class SarStandardsInfoController extends BaseController<SarStandardsInfo>
@Autowired
ISarLawsInfoService sarLawsInfoEOService;
// @ApiOperation(value="SarStandardsInfoEO|反向标准操作")
// @GetMapping(value = "/reverseQueryStand")
// public void reverseQueryStand(@RequestParam(name="ids",required=true) String ids, String standName, String type) {
// this.sarStandardsInfoEOService.reverseQueryStand(Arrays.asList(ids.split(",")),standName,type);
// }
@ApiOperation(value = "|SarStandardsInfoEO|自定义分页查询")
@GetMapping("/getSarStandardsInfoPage")
//@RequiresPermissions("lawss:sarStandardsInfo:getSarStandardsInfoPage")