Commit 858f59fa92453b39bfe7bd00a1a5e1b8ae2ebaf2
Merge branch 'master_chujiang_0805' into master_quotation
Showing
1 changed file
with
1 additions
and
1 deletions
| @@ -307,7 +307,7 @@ public class ShipmentsOrderInfoController extends DefaultBaseController { | @@ -307,7 +307,7 @@ public class ShipmentsOrderInfoController extends DefaultBaseController { | ||
| 307 | * 生成发货单和要车相关数据 | 307 | * 生成发货单和要车相关数据 |
| 308 | */ | 308 | */ |
| 309 | @ApiOperation("生成发货单和要车相关数据") | 309 | @ApiOperation("生成发货单和要车相关数据") |
| 310 | - @HasPermission({"shipping-plan-manage:shipping-plan:generate"}) | 310 | + @HasPermission({"shipping-plan-manage:shipping-plan:generate", "shipping-plan-manage:shipping-plan:generate1"}) |
| 311 | @PostMapping("/generate") | 311 | @PostMapping("/generate") |
| 312 | public InvokeResult<Void> generate(@Valid @RequestBody GenerateShipmentsOrderVo vo) { | 312 | public InvokeResult<Void> generate(@Valid @RequestBody GenerateShipmentsOrderVo vo) { |
| 313 | // 生成发货单和要车单、要车计划相关数据 | 313 | // 生成发货单和要车单、要车计划相关数据 |