冲突

yujian

2019-05-09 2764ae2d7f4d9cb9810a2188c92cb2eb439c3f22

 fanli/src/main/java/com/yeshi/fanli/controller/xcx/XcxUserInfoController.java

@@ -36,7 +36,6 @@
import com.yeshi.fanli.service.inter.order.OrderService;

import com.yeshi.fanli.service.inter.user.AccountMessageService;

import com.yeshi.fanli.service.inter.user.ExtractService;

import com.yeshi.fanli.service.inter.user.PassWordErrorRecordService;

import com.yeshi.fanli.service.inter.user.ShamUserService;

import com.yeshi.fanli.service.inter.user.UserInfoService;

import com.yeshi.fanli.util.Constant;

@@ -61,9 +60,6 @@


   @Resource

   private ExtractService extractService;



   @Resource

   private PassWordErrorRecordService passWordErrorRecordService;



   @Resource

   private ConfigService configService;