Merge branch 'crm_need_15.4_06_03' of http://8.136.199.33:3000/hongze/hz_crm_api into debug

models/company/company_approval.go

@@ -524,10 +524,8 @@ func FreezeToTryOutXClassRai(companyId, productId, sellerId, companyApprovalId,
 		}
 	}()
 
-	//123月份申请转正通过时，将试用期限延长(更新)至4.30。456月份申请转正通过时，将试用期限延长至7.31。789月份申请转正通过时，将试用期限延长至10.31。101112月份申请转正通过时，将试用期限延长至次年1.31。
-	endDate = utils.GetLastDayOfQuarter(time.Now()).Format(utils.FormatDate)
 	startDate = time.Now().Format(utils.FormatDate)
-	//endDate = time.Now().AddDate(0, 3, 0).Format(utils.FormatDate)
+	endDate = time.Now().AddDate(0, 2, 0).Format(utils.FormatDate)
 
 	//sellerItem, err := system.GetSysAdminById(applyUserId)
 	//if err != nil {
@@ -604,7 +602,7 @@ func FreezeToTryOutXClassRai(companyId, productId, sellerId, companyApprovalId,
 			LastUpdatedTime:    time.Now(),
 			ChartPermissionId:  v.ChartPermissionId,
 			StartDate:          v.StartDate,
-			EndDate:            v.EndDate,
+			EndDate:            endDate,
 			ProductId:          productId,
 			ProductName:        productName,
 			//CompanyContractId:         companyContractId,