[bugfix] 标记功能的完善
Merge branch 'refs/heads/develop'