Merge pull request 'feature_xml 修复合并代码错误' (#77) from feature_xml into develop

Reviewed-on: http://101.201.121.115:3000/leo/LAPP_LF_MOM_BACKEND/pulls/77
Reviewed-by: zhangxin <xin.zhang@le-it.com.cn>

models/log/PackTemplate.model.go

@@ -46,6 +46,7 @@ type PackTemplate struct {
 	LastModify     grmi.DateTime `xorm:"datetime 'LastModify' not null updated" json:"LOG_PackTemplate-LastModify"`
 	LastUser       string        `xorm:"nvarchar(20) 'LastUser' not null" json:"LOG_PackTemplate-LastUser"`
 	CreateTime     grmi.DateTime `xorm:"datetime 'CreateTime' not null created" json:"LOG_PackTemplate-CreateTime"`
+	Items          []PackTemplateItemlst `xorm:"-" json:"LOG_PackTemplate-Items"`
 }
 
 /******************************************************************************