Merge branch 'dev_鉴定优化_20190611' into test6.9.6

@@ -15,6 +15,7 @@ import com.yoho.order.model.ExpressScreenshots;
 import com.yoho.ufo.order.response.ExpressScreenshotsPicRsp;
 import com.yoho.ufo.order.response.ExpressScreenshotsRsp;
 import com.yoho.ufo.order.service.IExpressScreenshotsService;
+import com.yoho.ufo.service.impl.UserHelper;
 
 /**
  * @author craig.qin
@@ -33,11 +34,9 @@ public class ExpressScreenshotsServiceImpl implements IExpressScreenshotsService
 		record.setWaybillCode(waybillCode);
         record.setUrl(url);
         record.setCreateTime(DateUtil.getCurrentTimeSecond());
-//        UserHelper userInfo = new UserHelper();
-//        record.setCreateUid(userInfo.getUserId());
-//        record.setCreateUserName(userInfo.getUserName());
-        record.setCreateUid(10961101);
-        record.setCreateUserName("测试名字");
+        UserHelper userInfo = new UserHelper();
+        record.setCreateUid(userInfo.getUserId());
+        record.setCreateUserName(userInfo.getUserName());
         
         return expressScreenshotsMapper.insert(record);
 	}