Commit Graph

  • 4ba16c1c1b 修复添加营养配餐没有餐号显示的bug 28353131@qq.com 2020-12-08 22:42:35 +0800
  • 32f30e6e57 Merge remote-tracking branch 'origin/master' into master czx 2020-12-08 18:14:39 +0800
  • 38cf0af13a 增加营养配餐合并列显示 czx 2020-12-08 18:13:32 +0800
  • 26f6e4e264 CRUD开票模块 ryoeiken 2020-12-08 18:12:18 +0800
  • d6b6151aea update ruoyi-ui/src/assets/styles/ruoyi.scss. 〝走走停停 2020-12-08 17:49:51 +0800
  • fbc071a573 关闭页签清理缓存数据 RuoYi 2020-12-08 16:43:26 +0800
  • 5a62019cdd 更新 如何修改为Tomcat相关注释配置与说明 疯狂的狮子li 2020-12-08 16:21:30 +0800
  • 6cfff90b4a 缓存仪表图设置默认大小 RuoYi 2020-12-08 16:13:21 +0800
  • 474cca921e 回显数据字典防止空值报错 RuoYi 2020-12-08 16:12:00 +0800
  • 1657e06be6 !132 update ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictDataController.java. Merge pull request !132 from abbfun/N/A 若依 2020-12-08 16:03:51 +0800
  • 33136439d5 员工性别回显 ryoeiken 2020-12-08 15:10:07 +0800
  • ad876c378c 修改生产环境数据库地址 ryoeiken 2020-12-08 15:09:36 +0800
  • 2aab3d0f48 前端员工订餐接口定义 czx 2020-12-08 11:56:06 +0800
  • e2fa131cf9 配餐功能营养配餐显示 ryoeiken 2020-12-08 11:48:31 +0800
  • 33fe8c08bb 完善配餐功能修改 ryoeiken 2020-12-08 11:31:29 +0800
  • c01eeb8521 update ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictDataController.java. abbfun 2020-12-08 11:11:34 +0800
  • 2cf46f7fc8 修复员工,护工管理查询错误 ryoeiken 2020-12-08 08:12:34 +0800
  • 914cc24d5b Merge remote-tracking branch 'origin/master' ryoeiken 2020-12-07 23:23:48 +0800
  • 42d10696c3 修复修改病人配餐不能读取病人信息 bug ryoeiken 2020-12-07 23:23:37 +0800
  • e59cb4ee64 构建生成次日报餐记录的sql脚本 28353131@qq.com 2020-12-07 22:41:49 +0800
  • 832ab863a2 Merge remote-tracking branch 'origin/master' 28353131@qq.com 2020-12-07 22:24:43 +0800
  • c4285c56ec 构建生成次日报餐记录的sql脚本 28353131@qq.com 2020-12-07 22:24:23 +0800
  • 92e53c810a 修复修改病人配餐错误 ryoeiken 2020-12-07 22:04:11 +0800
  • 2651c88c6b 修复修改病人配餐设置弹出层错误 ryoeiken 2020-12-07 18:01:37 +0800
  • 10e70120e8 配餐功能列表显示,查询 ryoeiken 2020-12-07 17:43:34 +0800
  • dea15c69de 员工订餐-获取用餐时间 ryoeiken 2020-12-07 17:33:31 +0800
  • a9f0e4aad2 修改病人配餐设置前端页面 ryoeiken 2020-12-07 17:32:04 +0800
  • 3bb9e8a105 修复病人配餐查询 ryoeiken 2020-12-07 16:06:10 +0800
  • 99abbdb015 Merge remote-tracking branch 'origin/master' into master czx 2020-12-07 14:55:40 +0800
  • ce92663f2c 更新前端病患配置列表显示格式,同时修改对应后端实现 czx 2020-12-07 14:54:10 +0800
  • f90899d72a 支持主题风格配置 RuoYi 2020-12-07 14:13:02 +0800
  • ac43c15b8b 病患默认配餐配置删除price字段,调整sql语句 czx 2020-12-07 13:50:05 +0800
  • ffddfb5da5 配餐功能前端页面改造 ryoeiken 2020-12-07 13:49:51 +0800
  • 69f30760f8 Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue 疯狂的狮子li 2020-12-07 12:59:35 +0800
  • b99ab862ef 病人报餐修改弹出层正餐类型回显 ryoeiken 2020-12-07 08:18:48 +0800
  • 7e78a9167f 修改用户头像预览宽高 RuoYi 2020-12-06 16:22:45 +0800
  • 563e11d9c1 get请求params添加null值判断 RuoYi 2020-12-06 11:05:02 +0800
  • 5d15dc37ec 增加报餐前端设计说明 28353131@qq.com 2020-12-06 08:33:59 +0800
  • c99bedef5c 增加预开票开发说明 28353131@qq.com 2020-12-05 10:38:02 +0800
  • 720951dcdb Merge remote-tracking branch 'origin/master' 28353131@qq.com 2020-12-05 09:50:09 +0800
  • 423dadc5d6 新增功能文档描述 28353131@qq.com 2020-12-05 09:49:40 +0800
  • 1638bdd145 Merge remote-tracking branch 'origin/master' into master ryoeiken 2020-12-04 17:43:22 +0800
  • 0b289f2abf 补贴弹出层科室筛选 ryoeiken 2020-12-04 17:42:59 +0800
  • 4e447e3e39 完善病患配餐页面 czx 2020-12-04 17:41:42 +0800
  • 801412ef96 Merge remote-tracking branch 'origin/master' into master czx 2020-12-04 16:10:09 +0800
  • e94a6eeec2 查询员工信息列表附带科室信息传入弹出层 ryoeiken 2020-12-04 16:01:19 +0800
  • 0b9a5baf7a Merge remote-tracking branch 'origin/master' into master czx 2020-12-04 15:55:05 +0800
  • 5a2a31c552 补贴页面添加补贴发放弹出层,添加查询员工信息列表附带科室信息 ryoeiken 2020-12-04 15:43:12 +0800
  • e80349c343 Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue 疯狂的狮子li 2020-12-04 11:46:29 +0800
  • ef92ad4d8c 支持get请求映射params参数 RuoYi 2020-12-04 10:52:20 +0800
  • d8b006c15f 升级bitwalker到最新版本1.21 RuoYi 2020-12-04 10:51:20 +0800
  • 355258abbb Merge remote-tracking branch 'origin/master' into master czx 2020-12-04 08:08:21 +0800
  • 0e571bde22 病患配餐列表中增加正餐菜品名回显 28353131@qq.com 2020-12-03 23:16:28 +0800
  • e6e6a94784 搭建病患配餐页面 ryoeiken 2020-12-03 18:11:09 +0800
  • a8567345c9 完善营养套餐管理 ryoeiken 2020-12-03 17:32:17 +0800
  • 5da5451cbc 营养配餐设置功能页面 ryoeiken 2020-12-03 16:02:32 +0800
  • 107def44eb Merge remote-tracking branch 'origin/master' into master czx 2020-12-03 14:36:18 +0800
  • 6d342a00ca 修改病人配餐设置管理,病人营养配餐管理 ryoeiken 2020-12-03 14:35:43 +0800
  • 0e2b97a886 升级poi到最新版本4.1.2 RuoYi 2020-12-03 13:28:04 +0800
  • 1c7a5faae8 Excel支持注解align对齐方式 RuoYi 2020-12-03 13:26:46 +0800
  • d2cef9c40d 新增 关于多数据源事务 疯狂的狮子li 2020-12-03 11:32:29 +0800
  • b346036cca 增加 多数据源事务描述 疯狂的狮子li 2020-12-03 11:30:48 +0800
  • 5ebd0a971f Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue 疯狂的狮子li 2020-12-03 11:20:50 +0800
  • c50e058953 为所有MP插件增加官方链接 疯狂的狮子li 2020-12-03 11:15:54 +0800
  • a3dfa843af 增加 多数据源使用注意事项 疯狂的狮子li 2020-12-03 11:13:58 +0800
  • 23868c4fad 防止安全扫描YUI出现的风险提示 RuoYi 2020-12-03 10:26:22 +0800
  • a5b4cc6c18 修复每周菜谱翻页异常bug czx 2020-12-03 09:39:43 +0800
  • 54ff1d29ef 结算收款功能 czx 2020-12-02 17:47:12 +0800
  • 85716eb8d8 结算收款功能(未完) czx 2020-12-02 14:34:36 +0800
  • 81a2e5578e 防止预付费重复收款 czx 2020-12-02 09:50:23 +0800
  • 1f89abf51d 更新系统标题相关内容 czx 2020-12-02 08:52:48 +0800
  • 970a194347 导入getuser包 czx 2020-12-01 17:45:28 +0800
  • a5107c5a44 Merge remote-tracking branch 'origin/master' into master czx 2020-12-01 17:42:02 +0800
  • 26e0c50d96 Merge remote-tracking branch 'origin/master' into master ryoeiken 2020-12-01 17:41:18 +0800
  • ff8737de03 结算管理后端获取最近一次结算时间以及距当前时间的天数 ryoeiken 2020-12-01 17:41:06 +0800
  • e2ad86e682 增加判断是否已经支付预付伙食费(未完) czx 2020-12-01 16:55:57 +0800
  • 43b05b9781 数据库结构调整createby int --> varchar czx 2020-12-01 16:39:00 +0800
  • 147dbe0e15 修复每周菜谱自动计价功能bug czx 2020-12-01 16:07:35 +0800
  • d61517cf46 Merge remote-tracking branch 'origin/master' into master czx 2020-12-01 15:30:44 +0800
  • 0b5b7db96d 临时 czx 2020-12-01 15:30:17 +0800
  • b94f753ae5 Merge remote-tracking branch 'origin/master' into master ryoeiken 2020-12-01 15:29:00 +0800
  • 03169452d8 预付费结算判断 ryoeiken 2020-12-01 15:28:46 +0800
  • af6b5546c9 结算管理页面调整 czx 2020-12-01 15:26:37 +0800
  • 2afb109bff 增加 maven多环境配置注释 疯狂的狮子li 2020-12-01 11:53:55 +0800
  • f7f7557d4d 项目修改为 maven多环境配置 疯狂的狮子li 2020-12-01 11:44:29 +0800
  • b36b413a69 Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue 疯狂的狮子li 2020-12-01 09:23:55 +0800
  • 3b2669d148 修改缓存监控内存单位 RuoYi 2020-11-30 19:27:03 +0800
  • d708c734df 增加查询结算记录(未完) czx 2020-11-30 18:05:14 +0800
  • 8657a73b92 修复添加预收费记录默认数据不完整 czx 2020-11-30 15:06:17 +0800
  • b4cfb9cb80 完成预付费收费功能 czx 2020-11-30 14:27:06 +0800
  • ce438f182a Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue 疯狂的狮子li 2020-11-30 12:41:39 +0800
  • 147b7d8896 预付款输入框控制正整数输入 czx 2020-11-30 11:50:00 +0800
  • 3e1b7163b0 收费弹出层关联选择按钮 czx 2020-11-30 11:38:54 +0800
  • f248b7d4af 预付费管理模块增加结算类型切换 czx 2020-11-30 11:24:12 +0800
  • 1147ea5f8a 设置用户头像悬停高度 RuoYi 2020-11-30 11:10:27 +0800
  • a1bf5aaf8e 升级element-ui版本到2.14.1 RuoYi 2020-11-30 10:37:48 +0800
  • 2797c1eb3a 修正转换字符串的目标字符集属性 RuoYi 2020-11-30 10:31:11 +0800
  • 1791d7cf40 !126 update pom.xml. Merge pull request !126 from abbfun/N/A 若依 2020-11-30 10:07:08 +0800
  • acf6cf7298 修复bug 28353131@qq.com 2020-11-29 17:03:42 +0800
  • 63e2052b9a 改造实现输入建议内容 28353131@qq.com 2020-11-29 16:49:26 +0800