更换型号的id为联合主键呈现在前台
Merge remote-tracking branch 're/master'