Merge branch 'develop' of zhengxifeng/zc100 into master

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

     }
     #zss .form-control-static font{
         float: right;
-        margin-right: 20%;
+        margin-right: 15%;
     }
     #retrieve-code{
         margin-top:0px !important;