Merge remote-tracking branch 'remotes/master/master' into caopeng_bate1

src/main/resources/static/css/base_initialize.css

@@ -28,7 +28,8 @@ img {
 fieldset,
 img,
 input,
-button {
+button,
+select{
     border: none;
     padding: 0;
     margin: 0;

src/main/resources/static/css/style_bkxx.css

@@ -175,7 +175,7 @@ a.left-list-ftitle:hover{
 .cxtj table .textbox-3{
     width:92.5%;
 }
-.cxtj table input,.layout_table input,.layout_table_fp input{
+.cxtj table input,.layout_table input,.layout_table_fp input,.textbox select {
     /*height: 26px;*/
     line-height: 26px;
     margin-top: -4px;