Merge branch 'dev-1.1.0' of https://172.16.32.165/hurugang/thmz_system into dev-1.1.0

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

@@ -36,7 +36,7 @@
         <div class="x_panel">
             <div class="panel-body">
             </div>
-            <div class="row" id="showDiv" style="padding: 10px;">
+            <div class="row" id="showDiv">
                 <div class="col-md-3 col-sm-3 col-xs-12">
                     <img src="/thmz/images/logo.png"/>
                 </div>

src/main/resources/templates/mz/west_pharmacy_dispensing.html

@@ -75,7 +75,7 @@
                     </div>
                 </form>
             </div>
-            <div style="padding: 5px;">
+            <div>
                 <table id="prescription_table"></table>
             </div>
         </div>