fix a bug and zhangxudong added

1) fix the bug that there are 2 lijingjings in s2gp and s1gp;
2) zhangxudong added and moved to s2gp;
3) move tianjian to the front of Shi in s3gp according the designed list