楚江ERP-权限code调整，和前端保持一致

@@ -45,7 +45,7 @@ public class OfficeController extends DefaultBaseController {
      * 查询列表
      * 查询列表
      */
      */
     @ApiOperation("查询列表")
     @ApiOperation("查询列表")
-    @HasPermission({"base-data:office:query"})
+    @HasPermission({"base-data:section-office:query"})
     @GetMapping("/query")
     @GetMapping("/query")
     public InvokeResult<PageResult<GetOfficeBo>> query(@Valid QueryOfficeVo vo) {
     public InvokeResult<PageResult<GetOfficeBo>> query(@Valid QueryOfficeVo vo) {
         PageResult<Office> pageResult = officeService.query(getPageIndex(vo), getPageSize(vo), vo);
         PageResult<Office> pageResult = officeService.query(getPageIndex(vo), getPageSize(vo), vo);
@@ -63,7 +63,7 @@ public class OfficeController 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({"base-data:office:query"})
+    @HasPermission({"base-data:section-office:query"})
     @GetMapping
     @GetMapping
     public InvokeResult<GetOfficeBo> get(@NotBlank(message = "id不能为空！") String id) {
     public InvokeResult<GetOfficeBo> get(@NotBlank(message = "id不能为空！") String id) {
         Office data = officeService.findById(id);
         Office data = officeService.findById(id);
@@ -79,7 +79,7 @@ public class OfficeController extends DefaultBaseController {
      * 新增
      * 新增
      */
      */
     @ApiOperation("新增")
     @ApiOperation("新增")
-    @HasPermission({"base-data:office:add"})
+    @HasPermission({"base-data:section-office:add"})
     @PostMapping
     @PostMapping
     public InvokeResult<Void> create(@Valid CreateOfficeVo vo) {
     public InvokeResult<Void> create(@Valid CreateOfficeVo vo) {
         officeService.create(vo);
         officeService.create(vo);
@@ -90,7 +90,7 @@ public class OfficeController extends DefaultBaseController {
      * 修改
      * 修改
      */
      */
     @ApiOperation("修改")
     @ApiOperation("修改")
-    @HasPermission({"base-data:office:modify"})
+    @HasPermission({"base-data:section-office:modify"})
     @PutMapping
     @PutMapping
     public InvokeResult<Void> update(@Valid UpdateOfficeVo vo) {
     public InvokeResult<Void> update(@Valid UpdateOfficeVo vo) {
         officeService.update(vo);
         officeService.update(vo);
@@ -102,7 +102,7 @@ public class OfficeController 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({"base-data:office:delete"})
+    @HasPermission({"base-data:section-office:delete"})
     @DeleteMapping
     @DeleteMapping
     public InvokeResult<Void> deleteById(@NotBlank(message = "id不能为空！") String id) {
     public InvokeResult<Void> deleteById(@NotBlank(message = "id不能为空！") String id) {
         officeService.deleteById(id);
         officeService.deleteById(id);

@@ -47,7 +47,7 @@ public class ProductVarietyController extends DefaultBaseController {
      * 查询列表
      * 查询列表
      */
      */
     @ApiOperation("查询列表")
     @ApiOperation("查询列表")
-    @HasPermission({"base-data:variety:query"})
+    @HasPermission({"base-data:product-variety:query"})
     @GetMapping("/query")
     @GetMapping("/query")
     public InvokeResult<PageResult<GetProductVarietyBo>> query(@Valid QueryProductVarietyVo vo) {
     public InvokeResult<PageResult<GetProductVarietyBo>> query(@Valid QueryProductVarietyVo vo) {
         PageResult<ProductVariety> pageResult = productVarietyService.query(getPageIndex(vo), getPageSize(vo), vo);
         PageResult<ProductVariety> pageResult = productVarietyService.query(getPageIndex(vo), getPageSize(vo), vo);
@@ -64,7 +64,7 @@ public class ProductVarietyController 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({"base-data:variety:query"})
+    @HasPermission({"base-data:product-variety:query"})
     @GetMapping
     @GetMapping
     public InvokeResult<GetProductVarietyBo> get(@NotBlank(message = "id不能为空！") String id) {
     public InvokeResult<GetProductVarietyBo> get(@NotBlank(message = "id不能为空！") String id) {
         ProductVariety data = productVarietyService.findById(id);
         ProductVariety data = productVarietyService.findById(id);
@@ -80,7 +80,7 @@ public class ProductVarietyController extends DefaultBaseController {
      * 新增
      * 新增
      */
      */
     @ApiOperation("新增")
     @ApiOperation("新增")
-    @HasPermission({"base-data:variety:add"})
+    @HasPermission({"base-data:product-variety:add"})
     @PostMapping
     @PostMapping
     public InvokeResult<Void> create(@Valid CreateProductVarietyVo vo) {
     public InvokeResult<Void> create(@Valid CreateProductVarietyVo vo) {
         productVarietyService.create(vo);
         productVarietyService.create(vo);
@@ -91,7 +91,7 @@ public class ProductVarietyController extends DefaultBaseController {
      * 修改
      * 修改
      */
      */
     @ApiOperation("修改")
     @ApiOperation("修改")
-    @HasPermission({"base-data:variety:modify"})
+    @HasPermission({"base-data:product-variety:modify"})
     @PutMapping
     @PutMapping
     public InvokeResult<Void> update(@Valid UpdateProductVarietyVo vo) {
     public InvokeResult<Void> update(@Valid UpdateProductVarietyVo vo) {
         productVarietyService.update(vo);
         productVarietyService.update(vo);
@@ -103,7 +103,7 @@ public class ProductVarietyController 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({"base-data:variety:delete"})
+    @HasPermission({"base-data:product-variety:delete"})
     @DeleteMapping
     @DeleteMapping
     public InvokeResult<Void> deleteById(@NotBlank(message = "id不能为空！") String id) {
     public InvokeResult<Void> deleteById(@NotBlank(message = "id不能为空！") String id) {
         productVarietyService.deleteById(id);
         productVarietyService.deleteById(id);

@@ -45,7 +45,7 @@ public class WorkshopController extends DefaultBaseController {
      * 查询列表
      * 查询列表
      */
      */
     @ApiOperation("查询列表")
     @ApiOperation("查询列表")
-    @HasPermission({"base-data:workshop:query"})
+    @HasPermission({"base-data:maker:query"})
     @GetMapping("/query")
     @GetMapping("/query")
     public InvokeResult<PageResult<GetWorkshopBo>> query(@Valid QueryWorkshopVo vo) {
     public InvokeResult<PageResult<GetWorkshopBo>> query(@Valid QueryWorkshopVo vo) {
 
 
@@ -63,7 +63,7 @@ public class WorkshopController extends DefaultBaseController {
      * 新增
      * 新增
      */
      */
     @ApiOperation("新增")
     @ApiOperation("新增")
-    @HasPermission({"base-data:workshop:add"})
+    @HasPermission({"base-data:maker:add"})
     @PostMapping
     @PostMapping
     public InvokeResult<Void> create(@Valid CreateWorkshopVo vo) {
     public InvokeResult<Void> create(@Valid CreateWorkshopVo vo) {
         workshopService.create(vo);
         workshopService.create(vo);
@@ -74,7 +74,7 @@ public class WorkshopController extends DefaultBaseController {
      * 修改
      * 修改
      */
      */
     @ApiOperation("修改")
     @ApiOperation("修改")
-    @HasPermission({"base-data:workshop:modify"})
+    @HasPermission({"base-data:maker:modify"})
     @PutMapping
     @PutMapping
     public InvokeResult<Void> update(@Valid UpdateWorkshopVo vo) {
     public InvokeResult<Void> update(@Valid UpdateWorkshopVo vo) {
         workshopService.update(vo);
         workshopService.update(vo);
@@ -86,7 +86,7 @@ public class WorkshopController 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({"base-data:workshop:delete"})
+    @HasPermission({"base-data:maker:delete"})
     @DeleteMapping
     @DeleteMapping
     public InvokeResult<Void> deleteById(@NotBlank(message = "id不能为空！") String id) {
     public InvokeResult<Void> deleteById(@NotBlank(message = "id不能为空！") String id) {
         workshopService.deleteById(id);
         workshopService.deleteById(id);
@@ -98,7 +98,7 @@ public class WorkshopController extends DefaultBaseController {
      */
      */
     @ApiOperation("厂房详情")
     @ApiOperation("厂房详情")
     @ApiImplicitParam(value = "ID", name = "id", paramType = "query", required = true)
     @ApiImplicitParam(value = "ID", name = "id", paramType = "query", required = true)
-    @HasPermission({"base-data:workshop:query", "base-data:workshop:add", "base-data:workshop:modify"})
+    @HasPermission({"base-data:maker:query"})
     @GetMapping
     @GetMapping
     public InvokeResult<GetWorkshopBo> get(@NotBlank(message = "ID不能为空！") String id) {
     public InvokeResult<GetWorkshopBo> get(@NotBlank(message = "ID不能为空！") String id) {
         Workshop data = workshopService.findById(id);
         Workshop data = workshopService.findById(id);