feat: department part && fix: merge problems#18

xiayeweiliang wants to merge 8 commits into

RandomLemon:mainRandomLemon/neco:mainfrom

xiayeweiliang:mainxiayeweiliang/neco:mainCopy head branch name to clipboard