Merge remote-tracking branch 'origin/main'

cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plate/PlateController.java

@@ -58,7 +58,7 @@ public class PlateController {
     @DeleteMapping("/delete")
     @Operation(summary = "删除生产单板件")
     @Parameter(name = "id", description = "编号", required = true)
-    @PreAuthorize("@ss.hasPermission('executor:plate:delete')")
+    @PreAuthorize("@ss.hasAnyPermissions('executor:plate:delete','placeorder:optimize')")
     public CommonResult<Boolean> deletePlate(@RequestParam("id") Long id) {
         plateService.deletePlate(id);
         return success(true);

cf-module-report/cf-module-report-biz/pom.xml

@@ -169,6 +169,9 @@
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-maven-plugin</artifactId>
                 <version>${spring.boot.version}</version>
+                <configuration>
+                    <includeSystemScope>true</includeSystemScope>
+                </configuration>
                 <executions>
                     <execution>
                         <goals>