Merge remote-tracking branch 'origin/dev' into dev

xuhy

2024-02-01 8dd61e711d7cccd7d8d1278ab79a73e7a41aad4d

 UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IOpenCityService.java

@@ -22,5 +22,5 @@
     * @return
     * @throws Exception
     */
    boolean openCity(Double lat, Double lnt) throws Exception;
    String openCity(Double lat, Double lnt, Integer language) throws Exception;
}