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

优化发药窗口显示文案

See merge request hurugang/thmz_system!31

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

@@ -55,7 +55,7 @@
                     </div>
                 </div>
                 <div class="col-md-9 col-sm-9 col-xs-12" style="height: 40px; border: 1px solid #fff;">
-                    <span style="color: #DD6D22;line-height: 40px;font-size: 30px; text-line: center;font-weight: 700;">友情提示：胸痛，卒中，创伤以及残障人士，65岁以上老年人，军人优先</span>
+                    <span style="color: #DD6D22;line-height: 40px;font-size: 30px; text-line: center;font-weight: 700;">胸痛、卒中、创伤、65岁以上老年人、残障、军人优先</span>
                 </div>
                 <div style="margin-top: 110px;">
                     <table class="table table-striped table-bordered" id="tableList">