|
|
@@ -22,11 +22,8 @@ import com.zhongzheng.modules.top.order.domain.TopOrderRecNote;
|
|
|
import com.zhongzheng.modules.top.order.mapper.TopOrderRecNoteMapper;
|
|
|
import com.zhongzheng.modules.top.order.service.ITopOrderRecNoteService;
|
|
|
import com.zhongzheng.modules.top.order.vo.TopOrderRecNoteVo;
|
|
|
-<<<<<<< HEAD
|
|
|
import org.springframework.beans.factory.annotation.Value;
|
|
|
-=======
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
->>>>>>> dev
|
|
|
import org.springframework.stereotype.Service;
|
|
|
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
|
|
@@ -47,13 +44,11 @@ import java.util.stream.Collectors;
|
|
|
@Service
|
|
|
public class TopOrderRecNoteServiceImpl extends ServiceImpl<TopOrderRecNoteMapper, TopOrderRecNote> implements ITopOrderRecNoteService {
|
|
|
|
|
|
-<<<<<<< HEAD
|
|
|
@Value("${oldSys.host}")
|
|
|
private String OLD_SYS_HOST;
|
|
|
-=======
|
|
|
+
|
|
|
@Autowired
|
|
|
private ITopOldOrderService iTopOldOrderService;
|
|
|
->>>>>>> dev
|
|
|
|
|
|
@Override
|
|
|
public TopOrderRecNoteVo queryById(Long id){
|
