Merge branch 'master' into Liudl

bklLiudl

2024-03-19 16ae0857633ee15170ed63d3e22c380a9350148c

 HTML/views/SOSetting/ComBoxInfo.html

@@ -97,6 +97,7 @@
                // 表单需要的变量
            var infoOptions = {
               elem: '#LAY-app-content-list',
               // height: h1,
               height: 'full-100',
               id: 'LAY-app-content-list',
               page: true,