Merge branch 'develop1.0' into wt_from_develop1.0

VVT789

2025-03-22 ff76035a5d9c4de83bdf4c7feb86c842715f1312

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