Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev

master
zyx 5 years ago
commit 6f7c814051

@ -231,7 +231,7 @@ class UserController extends BaseController
$userData = M('User', 'tab_')->where($whereUser)->find();
if (!empty($userData)) {
if (empty($userData['promote_id']) && empty($userData['promote_account'])) {
if (empty($userData['promote_id'])) {
$saveData['promote_id'] = $promoteId;
$saveData['promote_account'] = $promoteData['account'];

Loading…
Cancel
Save