解决冲突

mitao

2025-02-24 17848d94d06a5e362c03c020735476f1f2295b95

 springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/service/ISystemMenuService.java

@@ -1,7 +1,7 @@
package com.panzhihua.sangeshenbian.service;

import com.baomidou.mybatisplus.extension.service.IService;
import com.panzhihua.sangeshenbian.model.SystemMenu;
import com.panzhihua.sangeshenbian.model.entity.SystemMenu;

import java.util.List;