Merge branch 'develop' of zhengxifeng/zc100 into master

template/pc/js/botstrap-step/style.css

@@ -802,7 +802,7 @@ only screen and (                min-resolution: 2dppx) {
     /*表格样式**/
     .p-con68 table, th, td{
         border: 1px solid #999;
-        padding: 5px 10px;
+        padding: 5px 0px;
         font-size: 12px;
         font-weight: 300;
         overflow: hidden;