From 17848d94d06a5e362c03c020735476f1f2295b95 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期一, 24 二月 2025 00:21:47 +0800
Subject: [PATCH] 解决冲突

---
 springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/service/IComplaintProgressService.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/service/IComplaintProgressService.java b/springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/service/IComplaintProgressService.java
index 9435f59..8fce8b4 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/service/IComplaintProgressService.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/service/IComplaintProgressService.java
@@ -1,6 +1,6 @@
 package com.panzhihua.sangeshenbian.service;
 
-import com.panzhihua.sangeshenbian.entity.ComplaintProgress;
+import com.panzhihua.sangeshenbian.model.entity.ComplaintProgress;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 /**

--
Gitblit v1.7.1