From c89dd113d8573a10a9e666785b8be5d4c3ef511d Mon Sep 17 00:00:00 2001
From: ali <ali9696@163.com>
Date: 星期一, 24 二月 2025 15:05:27 +0800
Subject: [PATCH] Merge branch 'develop1.0' into develop_alioo
---
zhitan-admin/src/main/java/com/zhitan/web/controller/basicdata/SysEnergyController.java | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/zhitan-admin/src/main/java/com/zhitan/web/controller/basicdata/SysEnergyController.java b/zhitan-admin/src/main/java/com/zhitan/web/controller/basicdata/SysEnergyController.java
index e793254..16fabf2 100644
--- a/zhitan-admin/src/main/java/com/zhitan/web/controller/basicdata/SysEnergyController.java
+++ b/zhitan-admin/src/main/java/com/zhitan/web/controller/basicdata/SysEnergyController.java
@@ -36,7 +36,7 @@
/**
* 鏌ヨenerclassname鑳芥簮绫诲瀷鍚嶇О涓嬫媺妗�
*/
- @PreAuthorize("@ss.hasPermi('enerInfoManage:energy:getenerclassname')")
+ @PreAuthorize("@ss.hasPermi('enerInfoManage:energy:list')")
@GetMapping("/getenerclassname")
public AjaxResult list()
{
@@ -82,7 +82,7 @@
/**
* 鑾峰彇energy璇︾粏淇℃伅
*/
- @PreAuthorize("@ss.hasPermi('enerInfoManage:energy:query')")
+ @PreAuthorize("@ss.hasPermi('enerInfoManage:energy:list')")
@GetMapping(value = "/{enerid}")
public AjaxResult getInfo(@PathVariable("enerid") Integer enerid)
{
@@ -147,7 +147,7 @@
/**
* 淇濆瓨鑳芥簮鍗曚环璁剧疆
*/
- @PreAuthorize("@ss.hasPermi('enerInfoManage:energy:updateEnergyPrice')")
+ @PreAuthorize("@ss.hasPermi('enerInfoManage:energy:edit')")
@Log(title = "energy", businessType = BusinessType.UPDATE)
@PutMapping("/updateEnergyPrice")
public AjaxResult updateEnergyPrice(@RequestBody(required = false) SysEnergy sysEnergy) throws ParseException {
@@ -173,7 +173,7 @@
/**
* 淇濆瓨鑳芥簮鎶樻爣绯绘暟璁剧疆
*/
- @PreAuthorize("@ss.hasPermi('enerInfoManage:energy:updateEnergyCoefficient')")
+ @PreAuthorize("@ss.hasPermi('enerInfoManage:energy:edit')")
@Log(title = "energy", businessType = BusinessType.UPDATE)
@PutMapping("/updateEnergyCoefficient")
public AjaxResult updateEnergyCoefficient(@RequestBody(required = false) SysEnergy sysEnergy) throws ParseException {
--
Gitblit v1.9.3