Merge branch 'crm/crm_14.2' of http://8.136.199.33:3000/hongze/hz_crm_api

models/db.go

@@ -239,7 +239,6 @@ func initCompany() {
 		new(company.CompanyPermissionLog),
 		new(company.CompanyReportPermission),
 		new(company.CompanyContract),
-		new(company.CompanyContractMerge), //续约合同，新签合同进行合并
 		new(company.CompanyContractPermission),
 		new(company.CompanyContractPermissionLog),
 		new(company.CompanyProduct),