Merge remote-tracking branch 'origin/master'

puzhibing

2023-07-03 df7267e50d468304ea6e8a2475a26fe9777238d0

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

@@ -13,5 +13,5 @@
     * @param uid
     * @throws Exception
     */
    ResultUtil feedback(String content, Integer uid) throws Exception;
    ResultUtil feedback(String content, Integer uid, Integer language) throws Exception;
}