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

增加颗粒剂药房设置

See merge request lihong/thmz_system!25

src/main/resources/templates/fy_config.html

@@ -32,6 +32,8 @@
                                 <option value="81">门诊中药房</option>
                                 <option value="73">住院药房</option>
                                 <option value="91">医材药房</option>
+                                <option value="82">颗粒剂药房</option>
+                                <option value="83">颗粒剂药房2</option>
                             </select>
                         </div>
                         <label class="control-label col-md-2 col-sm-2 col-xs-12" for="groupYk">当前库房<span style="color: red">(药房请保证当前库房为空)</span>