Merge branch 'master' into develop1.0

VVT789

2025-02-17 466c70dccc2b46ffa62fd14c8b2f88349c5ef9c6

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