Merge branch 'dev-1.1.4' into 'dev-1.1.4'

排队取药界面调整

See merge request lihong/thmz_system!29

src/main/resources/templates/mz/pharmacy-cell.html

@@ -70,11 +70,11 @@
                 </div>
                 <div style="margin-top: 200px;">
                     <button type="button" id="btn_med_in_cert" class="btn btn-primary button-click"
-                            style="background: url('/thmz/images/ybpz.png')no-repeat;margin-left: 200px;cursor:pointer"
+                            style="background: url('/thmz/images/ybpz.png')no-repeat;margin-left: 50px;cursor:pointer"
                             title="医保凭证">
                     </button>
                     <button type="button" id="btn_patient_id" class="btn btn-primary button-click"
-                            style="background: url('/thmz/images/jfpz.png')no-repeat;margin-left: 200px;cursor:pointer"
+                            style="background: url('/thmz/images/jfpz.png')no-repeat;margin-left: 50px;cursor:pointer"
                             title="缴费凭证">
                     </button>
                 </div>