/**
 * 
 */
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 {

	
	
}

@@ -88,29 +88,16 @@
 rvice;%0A%0A
-%3C%3C%3C%3C%3C%3C%3C HEAD%0A
 import c
@@ -182,65 +182,8 @@
 l;%0A%0A
-=======%0A%3E%3E%3E%3E%3E%3E%3E e29539dff60f85419c4469ca27c1b309769013f3%0A
 /**%0A
@@ -249,29 +249,16 @@
 n %0A */%0A%0A
-%3C%3C%3C%3C%3C%3C%3C HEAD%0A
 @Service
@@ -277,253 +277,8 @@
 e%22)%0A
-=======%0A%3C%3C%3C%3C%3C%3C%3C HEAD%0A@Service(%22userService%22)%0A=======%0A%3C%3C%3C%3C%3C%3C%3C HEAD%0A@Service(%22userService%22)%0A=======%0A%3E%3E%3E%3E%3E%3E%3E 6655372f9e8d6c6c58bddc39817e4fdfc5aad381%0A%3E%3E%3E%3E%3E%3E%3E 8b524b034893a58123136e072f9c2d5db6b0173c%0A%3E%3E%3E%3E%3E%3E%3E e29539dff60f85419c4469ca27c1b309769013f3%0A
 publ

Update UserServiceImpl.java