先前清空了master,修复合并冲突,修复了之前因合并而产生的bug #41

Closed
p7fulywfa wants to merge 1 commits from develop into master