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

取消报销比例必填

See merge request lihong/thmz_system!123

src/main/resources/templates/yk/drug_info.html

@@ -722,10 +722,9 @@
                     </div>
                     <div class="col-md-2 col-sm-2 col-xs-12 item">
                         <label class="control-label col-md-4 col-sm-4 col-xs-12" for="ybBlNew">报销比例(%)
-                            <span class="required">*</span>
                         </label>
                         <div class="col-md-8 col-sm-8 col-xs-12">
-                            <input id="ybBlNew" name="ybBlNew" class="form-control col-md-7 col-xs-12" type="number" required="required">
+                            <input id="ybBlNew" name="ybBlNew" class="form-control col-md-7 col-xs-12" type="number">
                         </div>
                     </div>
                     <div class="col-md-2 col-sm-2 col-xs-12 item">