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

ruoyi-admin/src/main/java/com/ruoyi/web/controller/warehouse/finance/TInvoiceController.java

@@ -41,7 +41,6 @@ public class TInvoiceController extends BaseController {
     /**
      * 查询财务数据主列表
      */
-    @PreAuthorize("@ss.hasPermi('finance:invoice:list')")
     @DataScope(deptAlias = "d", userAlias = "u")
     @GetMapping("/list")
     public TableDataInfo list(TFee tFee) {
@@ -56,7 +55,6 @@ public class TInvoiceController extends BaseController {
     /**
      * 导出财务数据主列表
      */
-    @PreAuthorize("@ss.hasPermi('finance:invoice:export')")
     @Log(title = "财务数据主", businessType = BusinessType.EXPORT)
     @DataScope(deptAlias = "d", userAlias = "u")
     @GetMapping("/export")
@@ -72,7 +70,6 @@ public class TInvoiceController extends BaseController {
     /**
      * 获取财务数据主详细信息
      */
-    @PreAuthorize("@ss.hasPermi('finance:invoice:query')")
     @GetMapping(value = "/{fId}")
     public AjaxResult getInfo(@PathVariable("fId") Long fId) {
         return AjaxResult.success(tFeeService.selectTFeeById(fId));
@@ -81,7 +78,6 @@ public class TInvoiceController extends BaseController {
     /**
      * 新增财务数据主
      */
-    @PreAuthorize("@ss.hasPermi('finance:invoice:add')")
     @Log(title = "财务数据主", businessType = BusinessType.INSERT)
     @PostMapping(value = "/add")
     @RepeatSubmit
@@ -95,14 +91,12 @@ public class TInvoiceController extends BaseController {
     /**
      * 删除财务数据主
      */
-    @PreAuthorize("@ss.hasPermi('finance:invoice:remove')")
     @Log(title = "财务数据主", businessType = BusinessType.DELETE)
     @DeleteMapping("/{fIds}")
     public AjaxResult remove(@PathVariable Long[] fIds) {
         return toAjax(tFeeService.deleteTFeeByIds(fIds));
     }
 
-    @PreAuthorize("@ss.hasPermi('finance:invoice:remove')")
     @Log(title = "财务数据主", businessType = BusinessType.DELETE)
     @DeleteMapping("/queryRemove/{fId}")
     public AjaxResult queryRemove(@PathVariable("fId") Long fId) {
@@ -112,7 +106,6 @@ public class TInvoiceController extends BaseController {
     /**
      * 发票查询
      */
-    @PreAuthorize("@ss.hasPermi('finance:invoice:list')")
     @GetMapping("/invoiceList")
     public TableDataInfo chargeList(TWareHouseFees tWareHouseFees) {
         startPage();
@@ -123,7 +116,6 @@ public class TInvoiceController extends BaseController {
     /**
      * 确认收费
      */
-    @PreAuthorize("@ss.hasPermi('finance:invoice:add')")
     @Log(title = "财务数据主", businessType = BusinessType.INSERT)
     @PostMapping(value = "/confirm")
     @RepeatSubmit
@@ -138,7 +130,6 @@ public class TInvoiceController extends BaseController {
     /**
      * 撤销收费
      */
-    @PreAuthorize("@ss.hasPermi('finance:invoice:revoke')")
     @Log(title = "财务数据主", businessType = BusinessType.INSERT)
     @PostMapping(value = "/revoke")
     @RepeatSubmit
@@ -152,7 +143,6 @@ public class TInvoiceController extends BaseController {
     /**
      * 导出入库详情主表列表
      */
-    @GetMapping("/exportItems/{fId}")
     public AjaxResult exportItems(@PathVariable("fId") Long fId) {
         List<Detailed> list = tFeeService.selectDetailedList(fId);
         String exportName = tFeeService.findCtrlcorpid(fId);