Merge remote-tracking branch 'origin/master_0929' into master_0929

@@ -73,7 +73,7 @@ public class SpecLockDelayApplicationController extends DefaultBaseController {
      * 查询列表
      * 查询列表
      */
      */
     @ApiOperation("查询列表")
     @ApiOperation("查询列表")
-    @HasPermission({"entity:speclockdelayapplication:query"})
+    @HasPermission({"contract-manage:unlocked-operation-application:query"})
     @GetMapping("/query")
     @GetMapping("/query")
     public InvokeResult<PageResult<QuerySpecLockDelayApplicationBo>> query(QuerySpecLockDelayApplicationVo vo) {
     public InvokeResult<PageResult<QuerySpecLockDelayApplicationBo>> query(QuerySpecLockDelayApplicationVo vo) {
         if (vo != null && StringUtils.isNotBlank(vo.getContractCode())) {
         if (vo != null && StringUtils.isNotBlank(vo.getContractCode())) {
@@ -155,7 +155,7 @@ public class SpecLockDelayApplicationController extends DefaultBaseController {
      */
      */
     @ApiOperation("根据ID查询")
     @ApiOperation("根据ID查询")
     @ApiImplicitParam(value = "id", name = "id", paramType = "query", required = true)
     @ApiImplicitParam(value = "id", name = "id", paramType = "query", required = true)
-    @HasPermission({"entity:speclockdelayapplication:query"})
+    @HasPermission({"contract-manage:unlocked-operation-application:query"})
     @GetMapping
     @GetMapping
     public InvokeResult<GetSpecLockDelayApplicationBo> get(@NotBlank(message = "id不能为空！") String id) {
     public InvokeResult<GetSpecLockDelayApplicationBo> get(@NotBlank(message = "id不能为空！") String id) {
 
 
@@ -191,7 +191,6 @@ public class SpecLockDelayApplicationController extends DefaultBaseController {
      * 新增
      * 新增
      */
      */
     @ApiOperation("新增")
     @ApiOperation("新增")
-    @HasPermission({"entity:speclockdelayapplication:add"})
     @PostMapping
     @PostMapping
     public InvokeResult<Void> create(@RequestBody CreateSpecLockDelayApplicationVo vo) throws Exception {
     public InvokeResult<Void> create(@RequestBody CreateSpecLockDelayApplicationVo vo) throws Exception {
 
 
@@ -204,7 +203,7 @@ public class SpecLockDelayApplicationController extends DefaultBaseController {
      * 修改
      * 修改
      */
      */
     @ApiOperation("修改")
     @ApiOperation("修改")
-    @HasPermission({"entity:speclockdelayapplication:modify"})
+    @HasPermission({"contract-manage:unlocked-operation-application:modify"})
     @PutMapping
     @PutMapping
     public InvokeResult<Void> update(@RequestBody UpdateSpecLockDelayApplicationVo vo) throws Exception {
     public InvokeResult<Void> update(@RequestBody UpdateSpecLockDelayApplicationVo vo) throws Exception {
 
 
@@ -255,6 +254,7 @@ public class SpecLockDelayApplicationController extends DefaultBaseController {
      * 订单申请延期取消
      * 订单申请延期取消
      */
      */
     @ApiOperation("订单申请延期取消")
     @ApiOperation("订单申请延期取消")
+    @HasPermission({"contract-manage:unlocked-operation-application:cancel"})
     @GetMapping("/cancel")
     @GetMapping("/cancel")
     public InvokeResult<Void> cancel(@NotBlank(message = "id不能为空！") String id) {
     public InvokeResult<Void> cancel(@NotBlank(message = "id不能为空！") String id) {