bug
This commit is contained in:
parent
179f49c58f
commit
8e893ae4d4
@ -457,8 +457,8 @@ public class ActiveExchangeServiceImpl implements ActiveExchangeService {
|
|||||||
activeFuletVOList.addAll(activeFuletVOLists);
|
activeFuletVOList.addAll(activeFuletVOLists);
|
||||||
//优惠券
|
//优惠券
|
||||||
//<<<<<<< HEAD
|
//<<<<<<< HEAD
|
||||||
//paymentActiveDTO.setUserId(userId);
|
paymentActiveDTO.setUserId(userId);
|
||||||
paymentActiveDTO.setUserId(117);
|
// paymentActiveDTO.setUserId(117);
|
||||||
//=======
|
//=======
|
||||||
if (ObjectUtils.isNotEmpty(paymentActiveDTO.getUserId())){
|
if (ObjectUtils.isNotEmpty(paymentActiveDTO.getUserId())){
|
||||||
userId = paymentActiveDTO.getUserId();
|
userId = paymentActiveDTO.getUserId();
|
||||||
|
Loading…
Reference in New Issue
Block a user