From 50ce6a5e5ae7ac6ce3e6281acca9a0db568306e6 Mon Sep 17 00:00:00 2001
From: unknown <sunxia@prec-tech.com>
Date: 星期三, 23 八月 2023 14:54:59 +0800
Subject: [PATCH] Merge branch 'LEX_dev' of http://47.92.229.245:8089/r/lightningupdate into LEX_dev

---
 force-app/main/default/classes/EquipmentRentalCancelController.cls |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/force-app/main/default/classes/EquipmentRentalCancelController.cls b/force-app/main/default/classes/EquipmentRentalCancelController.cls
index 1a053a0..a3407bb 100644
--- a/force-app/main/default/classes/EquipmentRentalCancelController.cls
+++ b/force-app/main/default/classes/EquipmentRentalCancelController.cls
@@ -141,7 +141,10 @@
             //}
             if (line.isSelect == true) {
                 Rental_Apply_Equipment_Set__c upd = new Rental_Apply_Equipment_Set__c();
-                upd = line.raes;
+                // 20230706 ljh DB202306220097 start 
+                // upd = line.raes;
+                upd.Id = line.raes.Id;
+                // 20230706 ljh DB202306220097 end 
                 upd.Cancel_Select__c = true;
                 upd.Cancel_Date__c = Date.today();
                 upd.Cancel_Time__c = MainFixtureSelectController.getCurrentTime();

--
Gitblit v1.9.1