/**
 * 
 */
package com.dale.ms.service.impl;

<<<<<<< HEAD
import org.springframework.stereotype.Service;

<<<<<<< HEAD
import com.dale.ms.service.MainService;
import com.dale.ms.service.base.BaseServiceImpl;

=======
=======
<<<<<<< HEAD
import org.springframework.stereotype.Service;

=======
>>>>>>> f42e15d758185e880610f91deb685ded138090ec
>>>>>>> 889a63e94037a79381ccdfe442f90f5073d73704
>>>>>>> e29539dff60f85419c4469ca27c1b309769013f3
/**
 * @author Dale'
 * @date 2017-5-2 下午1:57:40
 * @description 
 */
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======

<<<<<<< HEAD
=======
<<<<<<< HEAD
@Service("mainService")
=======
<<<<<<< HEAD
>>>>>>> 6655372f9e8d6c6c58bddc39817e4fdfc5aad381
>>>>>>> 8b524b034893a58123136e072f9c2d5db6b0173c
>>>>>>> e29539dff60f85419c4469ca27c1b309769013f3
@Service("mainService")
=======
>>>>>>> f42e15d758185e880610f91deb685ded138090ec
>>>>>>> 889a63e94037a79381ccdfe442f90f5073d73704
>>>>>>> 141436243474dfee36a70341663322d157819f89
public class MainServiceImpl {


	
	
}

/**
 * 
 */
package com.dale.ms.service.impl;

import org.springframework.stereotype.Service;

import com.dale.ms.service.MainService;
import com.dale.ms.service.base.BaseServiceImpl;

/**
 * @author Dale'
 * @date 2017-5-2 下午1:57:40
 * @description 
 */
@Service("mainService")
public class MainServiceImpl {


	
	
}

Update MainServiceImpl.java