SCB-1447 fix the problem according code review suggestion

Signed-off-by: kakulisen <18813972746@163.com>
9 files changed