Merge branch 'main' of http://47.98.207.247:3000/lsq/ship-ota-server into main

ship-module-trade/ship-module-trade-biz/src/main/java/com/yc/ship/module/trade/controller/admin/shipSaleRule/ShipSaleRuleController.java

@@ -74,7 +74,6 @@ public class ShipSaleRuleController {
     @GetMapping("/getOne")
     @Operation(summary = "获得时间规则配置")
     @Parameter(name = "id", description = "编号", required = true, example = "1024")
-    @PreAuthorize("@ss.hasPermission('trade:ship-sale-rule:query')")
     public CommonResult<ShipSaleRuleRespVO> getShipSaleRuleOne() {
         try {
             ShipSaleRuleDO shipSaleRule = shipSaleRuleService.getShipSaleRuleOne();