Merge remote-tracking branch 'origin/master'

admin

2018-12-12 263d995ed175dc8260b0f830751db376221e4ac9

 fanli/src/main/java/com/yeshi/fanli/controller/client/UserInfoController.java

@@ -9,7 +9,6 @@
import java.util.Arrays;

import java.util.Date;

import java.util.List;

import java.util.Map;

import java.util.UUID;



import javax.annotation.Resource;