Merge remote-tracking branch 'origin/feature-test1' into hr-uat

hls_rent(screen)/RENT100/room_info_edit.screen

@@ -5,7 +5,7 @@
     </a:init-procedure>
     <a:view>
         <script><![CDATA[
-            //二级联动12
+            //二级联动1222
     		function onCountryUpdate(ds,record,name,value,oldvalue){
     		    if(name == 'country_code'){
     		        console.log(name);