Merge remote-tracking branch 'origin/feature/fangxinxing' into feature/fang...

yanderong

2026-06-24 7c861cf4b82ec2d0b996fb583818f41a0ab9580f

Merge remote-tracking branch 'origin/feature/fangxinxing' into feature/fangxinxing

 ManagementYKDTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TCompanyController.java

@@ -16,6 +16,7 @@
import com.stylefeng.guns.modular.system.model.*;
import com.stylefeng.guns.modular.system.service.*;
import com.stylefeng.guns.modular.system.util.PushMinistryOfTransportUtil;
import com.stylefeng.guns.modular.system.util.ResultUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Controller;
@@ -138,10 +139,7 @@
    @RequestMapping("/entry_config_list")
    @ResponseBody
    public Object entryConfigList() {
        JSONObject result = new JSONObject();
        result.put("entryConfigList", getMenuEntryConfigList());
        result.put("entryMenuList", getEntryMenuList());
        return result;
        return ResultUtil.success(getMenuEntryConfigList());
    }

    /**