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

# Conflicts:
#	hls_rent(screen)/RENT100/room_info_edit.screen

hls_rent(screen)/RENT100/room_info_edit.screen

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

hls_rent(screen)/RENT100/room_info_input.screen

@@ -4,7 +4,7 @@
         <a:link id="pageLink_room_info_edit" url="${/request/@context_path}/modules/hls_rent/RENT100/room_info_edit.screen"/>
         <a:link id="pageLink_room_info_new" url="${/request/@context_path}/modules/hls_rent/RENT100/room_info_new.screen"/>
         <script><![CDATA[
-            //新增按钮
+            //新增按钮11
             function RENT100_roomInfoAdd(){
                 new Aurora.Window({
                     id:'room_info_new_window',