Merge remote-tracking branch 'origin/master'

songhua-admin/src/main/java/com/songhua/web/controller/system/BasicCruiseShipController.java

@@ -44,7 +44,7 @@ public class BasicCruiseShipController extends BaseController
      * 导出游船列表
      */
     @PreAuthorize("@ss.hasPermi('system:ship:export')")
-    @Log(title = "【请填写功能名称】", businessType = BusinessType.EXPORT)
+    @Log(title = "导出", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(HttpServletResponse response, BasicCruiseShip basicCruiseShip)
     {
@@ -67,7 +67,7 @@ public class BasicCruiseShipController extends BaseController
      * 新增游船
      */
     @PreAuthorize("@ss.hasPermi('system:ship:add')")
-    @Log(title = "【请填写功能名称】", businessType = BusinessType.INSERT)
+    @Log(title = "新增", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody BasicCruiseShip basicCruiseShip)
     {
@@ -78,7 +78,7 @@ public class BasicCruiseShipController extends BaseController
      * 修改游船
      */
     @PreAuthorize("@ss.hasPermi('system:ship:edit')")
-    @Log(title = "【请填写功能名称】", businessType = BusinessType.UPDATE)
+    @Log(title = "修改", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody BasicCruiseShip basicCruiseShip)
     {
@@ -89,7 +89,7 @@ public class BasicCruiseShipController extends BaseController
      * 删除游船
      */
     @PreAuthorize("@ss.hasPermi('system:ship:remove')")
-    @Log(title = "【请填写功能名称】", businessType = BusinessType.DELETE)
+    @Log(title = "删除", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable Long[] ids)
     {