Merge branch 'master' of https://github.com/Andy-Yin/zhitan-ems

ustcyc

2025-03-25 633c06e7e43c9700b0e410f0275b9b0ece1f9759

 zhitan-admin/src/main/java/com/zhitan/web/controller/basicdata/SysEnerclassController.java

@@ -42,7 +42,7 @@
    /**
     * 查询所有能源品种设置列表
     */
    @PreAuthorize("@ss.hasPermi('enerInfoManage:enerclass:list')")
//    @PreAuthorize("@ss.hasPermi('enerInfoManage:enerclass:list')")
    @GetMapping("/list")
    public AjaxResult list(SysEnerclass sysEnerclass)
    {