fixed bug from dev merge
fixed bug from dev merge

LiJingBiao/wax,dxd214/wax,felipejfc/n-wax,a20251313/wax,RoyZeng/wax,1yvT0s/wax,BITA-app/wax,dxd214/wax,qskycolor/wax,marinehero/wax,hj3938/wax,marinehero/wax,probablycorey/wax,BITA-app/wax,dxd214/wax,probablycorey/wax,taobao-idev/wax,LiJingBiao/wax,RoyZeng/wax,LiJingBiao/wax,FlashHand/wax,a20251313/wax,taobao-idev/wax,hj3938/wax,felipejfc/n-wax,dxd214/wax,1yvT0s/wax,marinehero/wax,qskycolor/wax,RoyZeng/wax,marinehero/wax,probablycorey/wax,chiyun1/wax,BITA-app/wax,felipejfc/n-wax,taobao-idev/wax,felipejfc/n-wax,probablycorey/wax,hj3938/wax,BITA-app/wax,1yvT0s/wax,FlashHand/wax,FlashHand/wax,hj3938/wax,chiyun1/wax,FlashHand/wax,qskycolor/wax,a20251313/wax,taobao-idev/wax,RoyZeng/wax,1yvT0s/wax,chiyun1/wax,LiJingBiao/wax,qskycolor/wax,a20251313/wax,chiyun1/wax