Merge remote-tracking branch 'origin/master'

陈昶聿

昨天 26908e0b46081ba52c9e806551eec77696e05a06

 smartor/src/main/java/com/smartor/mapper/PatMedInhospMapper.java

@@ -25,6 +25,8 @@
     */
    public PatMedInhosp selectPatMedInhospByInhospid(Long inhospid);

    public  List<PatMedInhosp> selectPatMedInhosp(PatMedInhosp patMedInhosp);

    public String getTagnameBypatid(Long patid);

    /**