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

退药原因显示优化

See merge request lihong/thmz_system!109

src/main/java/cn/hnthyy/thmz/controller/mz/MzPharmacyController.java

@@ -267,6 +267,7 @@ public class MzPharmacyController {
                     if (stringObjectMap.get("charge_item_code").equals(objectMap.get("charge_item_code"))
                             && stringObjectMap.get("item_no").equals(objectMap.get("item_no"))) {
                         objectMap.put("dec_amount", stringObjectMap.get("quantity"));
+                        objectMap.put("refund_medicine_remark", stringObjectMap.get("refund_medicine_remark"));
                     }
                 }
             }