Merge branch 'master' into master-手术随访

陈昶聿

6 天以前 586a386b2d779e94002c8099ff62271b0e684d88

 ruoyi-quartz/src/main/java/com/ruoyi/quartz/mapper/CollectHISMapper.java

@@ -45,6 +45,14 @@
    public List<SysUserDept> yhyksxx(SysUser sysUser);

    /**
     * 用户与病房信息
     *
     * @param sysUser
     * @return
     */
    public List<SysUserDept> yhybfxx(SysUser sysUser);

    /**
     * 用户与院区信息
     *
     * @param sysUser