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

import org.springframework.stereotype.Service;

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

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

<<<<<<< HEAD
@Service("userService")
=======
<<<<<<< HEAD
@Service("userService")
=======
<<<<<<< HEAD
@Service("userService")
=======
>>>>>>> 6655372f9e8d6c6c58bddc39817e4fdfc5aad381
>>>>>>> 8b524b034893a58123136e072f9c2d5db6b0173c
>>>>>>> e29539dff60f85419c4469ca27c1b309769013f3
public class UserServiceImpl {

	
	
}

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

import org.springframework.stereotype.Service;

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

/**
 * @author Dale'
 * @date 2017-5-2 下午1:57:40
 * @description 
 */

@Service("userService")
public class UserServiceImpl {

	
	
}

Update UserServiceImpl.java