Merge branch 'dev/2.2_daokuan' into debug

# Conflicts:
#	models/fms/contract_register.go

models/fms/contract_register.go

@@ -432,6 +432,13 @@ func CreateImportContractRegister(item *ContractRegister, serviceList []*Contrac
 	return
 }
 
+func GetContractInfoByRegisterIds(registerIds []int) (list []ContractRegister,err error) {
+	err = global.DEFAULT_MYSQL.Model(ContractRegister{}).
+		Where("is_deleted = 0 AND contract_register_id in ?", registerIds).
+		Find(&list).Error
+	return
+}
+
 // CreateContractRegisterAndServices 新增合同登记及套餐
 func CreateContractRegisterAndServicesAndPayMent(item *ContractRegister, serviceDetail []*ContractServiceAndDetail, prePayId int) (err error) {
 	tx := global.DEFAULT_MYSQL.Begin()
@@ -479,9 +486,3 @@ func CreateContractRegisterAndServicesAndPayMent(item *ContractRegister, service
 	return
 }
 
-func GetContractInfoByRegisterIds(registerIds []int) (list []ContractRegister,err error) {
-	err = global.DEFAULT_MYSQL.Model(ContractRegister{}).
-		Where("is_deleted = 0 AND contract_register_id in ?", registerIds).
-		Find(&list).Error
-	return
-}