From e9e1806b0f4b5bae1fc36204ccc5d6fdad52d66f Mon Sep 17 00:00:00 2001
From: buli <137736985@qq.com>
Date: 星期一, 05 六月 2023 11:22:08 +0800
Subject: [PATCH] Merge branch 'master' into LightningUpgradeProject
---
force-app/main/default/classes/NewMCHLimitPDFController.cls | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/force-app/main/default/classes/NewMCHLimitPDFController.cls b/force-app/main/default/classes/NewMCHLimitPDFController.cls
index 258f027..ed60a0a 100644
--- a/force-app/main/default/classes/NewMCHLimitPDFController.cls
+++ b/force-app/main/default/classes/NewMCHLimitPDFController.cls
@@ -233,6 +233,9 @@
public String TermSix_Six {get; private set;}
public String TermSix_Seven {get; private set;}
public String TermSix_Eight {get; private set;}
+ // 鏈嶅姟鍚堝悓鏂囨湰鏀归��20230411 start
+ public String TermSix_Nine {get; private set;}
+ // 鏈嶅姟鍚堝悓鏂囨湰鏀归��20230411 end
// public String TermSeven_Title {get; private set;}
// public String TermSeven_One {get; private set;}
// public String TermSeven_Two {get; private set;}
@@ -582,7 +585,9 @@
this.TermSix_Six = '6銆佺敳鏂瑰簲璇ヤ富鍔ㄧН鏋侀厤鍚堜箼鏂圭鐞嗚澶囷紝闄嶄綆鍥犱负浜轰负鍘熷洜閫犳垚鐨勬崯鍧忋��';
this.TermSix_Seven = '7銆佺敳鏂规湭缁忎箼鏂逛簨鍏堜功闈㈠悓鎰忥紝涓嶅緱灏嗘湰鍚堝悓褰撲簨浜虹殑鍦颁綅浠ュ強渚濇湰鍚堝悓浜х敓鐨勪换浣曟潈鍒╀箟鍔¤浆璁╃粰绗笁浜烘垨鎻愪緵鎷呬繚銆�';
this.TermSix_Eight = '8銆佺敳鏂瑰簲淇濆畧涔欐柟鐨勫晢涓氭満瀵嗭紝涓嶅緱鍚戜换浣曠涓夋柟娉勯湶浠讳綍鎴栧叏閮ㄥ寘鎷箼鏂圭殑閿�鍞�佸競鍦恒�佹妧鏈�佺淮淇互鍙婁换浣曞叾瀹冭鍛婄煡鎴栦粠鍙︿竴鏂瑰彇寰椾箼鏂圭殑淇℃伅锛涙棤璁烘淇℃伅鍦ㄦ湰鍚堝悓涓槸鍚︽爣鏄庢垨鐣屽畾涓烘満瀵嗐�傚悓鏃朵笉寰楀皢璇ヤ俊鎭敤浜庨潪鏈悎鍚屾墍杩扮殑鐩殑銆傛湰鏉¤瀹氱殑淇濆瘑鏈熼檺鍦ㄦ湰鍚堝悓鏈熸弧鎴栫粓姝㈠悗缁х画鏈夋晥銆�';
-
+ // 鏈嶅姟鍚堝悓鏂囨湰鏀归��20230411 start
+ this.TermSix_Nine = '9銆佺敳鏂逛簡瑙ｅ苟鍚屾剰锛屽湪灞ヨ鏈悎鍚岃繃绋嬩腑鐢变箼鏂规墍鏇挎崲涓嬬殑鏃ч浂閮ㄤ欢涓嶄簣杩旇繕銆傜敳鏂硅姹傝繑杩樼殑锛屽簲褰撲簬鏈悎鍚岀缃插悗7鏃ュ唴涔﹂潰鍛婄煡涔欐柟锛屼笖鍏佽涔欐柟杩旇繕鏃跺鏃ч浂閮ㄤ欢鍔熻兘杩涜涓�瀹氱殑鐮村潖銆�';
+ // 鏈嶅姟鍚堝悓鏂囨湰鏀归��20230411 end
// this.TermSeven_Title = '鍏�� 鐢蹭箼鍙屾柟鍚屾剰鏈悎鍚岃繘琛岀画绛炬椂锛岀户缁弬鍔犲悎鍚岀殑鍙備繚璁惧鐨勭画绛鹃噾棰濈敱璇ヨ澶囧湪鏈悎鍚屼腑鐨勫弬淇濅环鏍间笌鏈悎鍚岀殑鍚堝悓娑堣垂鐜囪绠楋紝鍏紡锛氱画绛鹃噾棰�=鏈悎鍚屽弬淇濅环鏍�*锛�1+璋冩暣姣斾緥%锛夈�� ';
// this.TermSeven_One = '锛堟敞锛氬悎鍚屾秷璐圭巼=鏈悎鍚屽鎵樻湡闄愬唴鎵�鏈夊弬淇濊澶囧彂鐢熺殑缁翠慨鎶ヤ环閲戦涔嬪拰/鍚堝悓閲戦*100%銆傚鎵樻湡闄愬眾婊″墠鐢变箼鏂硅礋璐ｅ鍚堝悓娑堣垂鐜囪繘琛岄浼帮紝鍙屾柟璁ゅ彲鍚庡彲浠ユ寜姝や綔涓哄埗瀹氱画绛鹃噾棰濈殑渚濇嵁銆傦級鈥�';
// this.TermSeven_Table11 = 'X<50%';
--
Gitblit v1.9.1