|
|
|
@@ -174,7 +174,7 @@ public class WxUserGrantController extends BaseController { |
|
|
|
wxCUserFrom.setFromId(Long.parseLong(basicUserId)); |
|
|
|
}else if(StringUtils.isNotBlank(merchantId)){ |
|
|
|
wxCUserFrom.setFromType(EnumCUserFrom.FROM_MERCHANT.getCode()); |
|
|
|
wxCUserFrom.setFromId(Long.parseLong(basicUserId)); |
|
|
|
wxCUserFrom.setFromId(Long.parseLong(merchantId)); |
|
|
|
}else{ |
|
|
|
|
|
|
|
} |
|
|
|
|