add record edit
Merge branch 'master' into lifei
add record /wirite /timer edit
Merge remote-tracking branch 'origin/master'