[feat] merge error hotfix#33

wdd1016 wants to merge 3 commits intomainFac2Real/monitory-data-source:mainfrom

developFac2Real/monitory-data-source:developCopy head branch name to clipboard