Authored by 赵鹏军

Merge branch 'master-mj-ztq' into 'master-mj'

Master mj ztq



See merge request !1230
@@ -1667,7 +1667,8 @@ a cite { @@ -1667,7 +1667,8 @@ a cite {
1667 border-bottom: 1px solid #f6f6f6; 1667 border-bottom: 1px solid #f6f6f6;
1668 color: #333; 1668 color: #333;
1669 border-radius: 2px 2px 0 0; 1669 border-radius: 2px 2px 0 0;
1670 - font-size: 14px 1670 + font-size: 14px;
  1671 + box-sizing: border-box;
1671 } 1672 }
1672 1673
1673 .layui-bg-black, .layui-bg-blue, .layui-bg-cyan, .layui-bg-green, .layui-bg-orange, .layui-bg-red { 1674 .layui-bg-black, .layui-bg-blue, .layui-bg-cyan, .layui-bg-green, .layui-bg-orange, .layui-bg-red {