Merge remote-tracking branch 'origin/master' into dev

This commit is contained in:
墨大叔 2024-09-26 11:15:37 +08:00
commit ef87631b5c

View File

@ -908,8 +908,8 @@ public class DeviceServiceImpl implements DeviceService
ServiceUtil.assertion(record != 1, "添加绑定记录失败");
// 用户设置为商户
boolean changeType = userService.changeType(userId, UserType.MCH);
ServiceUtil.assertion(record != 1, "修改用户类型失败");
// boolean changeType = userService.changeType(userId, UserType.MCH);
// ServiceUtil.assertion(record != 1, "修改用户类型失败");
return updateCount;
});