Merge branch 'master-v32-xwx' into 'master'

杭州-订阅管理-通知类型和通知方式加边框



See merge request !38

@@ -44,7 +44,7 @@
             <label class="layui-form-label">通知方式</label>
             <div class="layui-input-inline">
                 <input type="hidden" name="subWay" id="alarmsubscribe_subway" value="wechat">
-                <ul class="small-icon-group" id="alarmsubscribe_add_subway">
+                <ul class="small-icon-group" id="alarmsubscribe_add_subway" style="border: 1px #e8e8e8 solid; margin-right: 10px;height: 36px" >
                     <li class="small-icon-group-items" data-type="wechat"><i class="small-icon small-icon-wechat"></i></li>
                     <li class="small-icon-group-items gray" data-type="message"><i class="small-icon small-icon-msg"></i></li>
                     <li class="small-icon-group-items gray" data-type="email"><i class="small-icon small-icon-email"></i></li>
@@ -61,7 +61,7 @@
     <div class="layui-form-item">
         <div class="layui-inline ">
             <label class="layui-form-label">通知类型</label>
-            <div class="layui-input-inline">
+            <div class="layui-input-inline" style="border: 1px #e8e8e8 solid; margin-right: 10px;height: 36px" >
                 <input type="radio" name="sub_send_type" value="1" title="常用周期" checked lay-filter="sub_send-type">
                 <input type="radio" name="sub_send_type" value="2" title="时间表达式" lay-filter="sub_send-type">
             </div>