Merge remote-tracking branch 'origin/master'

puzhibing

2023-07-03 df7267e50d468304ea6e8a2475a26fe9777238d0

 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;
}