Merge branch 'refs/heads/develop1.0' into dyl_dev

DYL

2025-02-07 c58f449890007f3840f1fe8ae2df953e76b89d32

 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)
    {