Merge remote-tracking branch 'origin/master'

mitao

2025-02-24 33e5113e02e32b8553c5f4edd07eb1f149594f04

 springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/api/SystemRoleController.java

@@ -5,8 +5,8 @@
import com.panzhihua.common.controller.BaseController;
import com.panzhihua.common.interfaces.OperLog;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.sangeshenbian.model.SystemRole;
import com.panzhihua.sangeshenbian.model.SystemRoleMenu;
import com.panzhihua.sangeshenbian.model.entity.SystemRole;
import com.panzhihua.sangeshenbian.model.entity.SystemRoleMenu;
import com.panzhihua.sangeshenbian.service.ISystemRoleMenuService;
import com.panzhihua.sangeshenbian.service.ISystemRoleService;
import com.panzhihua.sangeshenbian.warpper.*;
@@ -25,7 +25,7 @@
 */
@Api
@RestController
@RequestMapping("/sangeshenbian/systemRole")
@RequestMapping("/systemRole")
public class SystemRoleController extends BaseController {
   
   @Resource