Modified merged error

Modified merged error
Merge branch '3.0.2' of https://github.com/ecomfe/esui into 3.0.2