Merge branch 'develop-wgk' of allen/gphm into develop

test

PHM-admin/phm-manage/src/main/java/com/phm/manage/controller/AeroplaneController.java

@@ -29,7 +29,7 @@ import com.phm.common.core.page.TableDataInfo;
  * @date 2023-08-22
  */
 @RestController
-@RequestMapping("/manage/aeroplane")
+@RequestMapping("/manage/aeroplane1")
 public class AeroplaneController extends BaseController {
     @Autowired
     private IAeroplaneService aeroplaneService;