Merge remote-tracking branch 'origin/master'

puzhibing

2023-05-18 53562814add61acfdc02d6b25dae6324f6fd5f92

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