Merge branch 'master' of https://172.16.32.165/lighter/web-server

src/main/java/thyyxxk/webserver/service/inpatient/ChargeListService.java

@@ -83,7 +83,7 @@ public class ChargeListService {
             v.setStatement("");
         }
         v.setBegndate(v.getBegndate() + " 00:00:00");
-        v.setEnddate(v.getEnddate() + " 23:59:59.999");
+        v.setEnddate(v.getEnddate() + " 23:59:59");
         List<ChargeItem> chargeList = v.needChargeDate()
                 ? dao.getChargeListWithChargeDate(v)
                 : dao.getChargeListWithoutChargeDate(v);