解决冲突

mitao

2025-02-24 17848d94d06a5e362c03c020735476f1f2295b95

 springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/service/impl/ComplaintProgressServiceImpl.java

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

import com.panzhihua.sangeshenbian.entity.ComplaintProgress;
import com.panzhihua.sangeshenbian.model.entity.ComplaintProgress;
import com.panzhihua.sangeshenbian.dao.ComplaintProgressMapper;
import com.panzhihua.sangeshenbian.service.IComplaintProgressService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;