Merge branch 'master' of http://192.168.1.74/MotorController/QD007E_CTRL_APP

# Conflicts:
#	MDK-ARM/JLinkLog.txt
#	MDK-ARM/bin/QD007A_CTL_APP.bin
#	User/Src/motor_control.c
#	User/Src/tasks.c
#	User/Src/var.c
#	修改说明.txt