Commit Graph

  • 67198aede9 README RuoYi 2020-12-15 10:06:12 +0800
  • 4f33da2a3f 登录后push添加catch防止出现检查错误 RuoYi 2020-12-15 10:04:09 +0800
  • 145b466bbe Merge remote-tracking branch 'origin/master' into master ryoeiken 2020-12-14 17:42:35 +0800
  • 025ae3c117 Merge remote-tracking branch 'origin/master' into master ryoeiken 2020-12-14 17:41:13 +0800
  • 21a2fcfed6 新增获取当天员工订单接口 czx 2020-12-14 17:40:34 +0800
  • 16e2baae11 Merge remote-tracking branch 'origin/master' into master czx 2020-12-14 17:26:45 +0800
  • 1ec7073027 同步升级 3.3 疯狂的狮子li 2020-12-14 09:28:15 +0800
  • 7e476b941e Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue 疯狂的狮子li 2020-12-14 09:27:27 +0800
  • 8988d0b4ab 若依 3.3.0 RuoYi 2020-12-14 09:02:10 +0800
  • ceefa20aa2 调整代码生成页列宽 RuoYi 2020-12-13 16:05:49 +0800
  • 89e1f2a53f 修改Set可能导致嵌套的问题 RuoYi 2020-12-13 15:01:03 +0800
  • 6800a12014 !138 修改Set可能导致嵌套的问题 Merge pull request !138 from BecomeDream/N/A 若依 2020-12-13 14:54:17 +0800
  • 8d4f3561d5 修复mybatis-plus插件不生效bug 疯狂的狮子li 2020-12-11 18:45:57 +0800
  • e8f63b2994 修改Set可能导致嵌套的问题 BecomeDream 2020-12-11 18:16:57 +0800
  • 11a7baeb03 新增获取当天员工订单接口 czx 2020-12-11 18:11:38 +0800
  • ecfe7006e2 代码生成预览支持高亮显示 RuoYi 2020-12-11 17:04:54 +0800
  • 8b88d91312 update README.md 疯狂的狮子li 2020-12-11 14:44:07 +0800
  • 1540db84df 新增获取当天员工订单接口 czx 2020-12-11 14:42:05 +0800
  • f56f57a236 Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue 疯狂的狮子li 2020-12-11 14:27:54 +0800
  • 9e387dc447 去除用户手机邮箱部门必填验证 RuoYi 2020-12-11 13:26:14 +0800
  • 231bbf6928 !135 增加日志记录过滤对象类型(解决多文件场景报错) Merge pull request !135 from geruishi/master 若依 2020-12-11 13:24:03 +0800
  • fe51f511a4 1、修复员工登录更新状态bug 2、返回配置信息bug czx 2020-12-11 11:10:28 +0800
  • d6eac2dc8d 前端更新插件版本 RuoYi 2020-12-11 09:27:12 +0800
  • a01ff2cbc4 员工订餐前端获取配置信息接口 28353131@qq.com 2020-12-10 22:45:45 +0800
  • 9e1f48d9d8 优化登录接口,记录登录状态,返回uuid 28353131@qq.com 2020-12-10 21:43:33 +0800
  • 89d06362a7 优化员工自动报餐sql,增加计算最新价格 czx 2020-12-10 17:57:56 +0800
  • cb8614201d 添加定时器,定时生成员工订餐记录 czx 2020-12-10 13:33:17 +0800
  • b368ad764f 升级core-js到最新版本3.8.1 RuoYi 2020-12-10 12:08:18 +0800
  • ffd5f0ce5d 升级vue-router到最新版本3.4.9 RuoYi 2020-12-10 11:14:44 +0800
  • a50beae599 代码生成预览提供滚动机制 RuoYi 2020-12-10 11:13:39 +0800
  • 84125a0f72 调整员工信息表结构 czx 2020-12-10 09:57:29 +0800
  • 31c9f6a7aa Merge remote-tracking branch 'origin/master' into master czx 2020-12-09 17:48:54 +0800
  • 4cb7ae256e 员工端登录返回 czx 2020-12-09 17:48:05 +0800
  • 6d4d7ef8f1 Merge remote-tracking branch 'origin/master' into master ryoeiken 2020-12-09 17:34:36 +0800
  • 56aa0ed630 完善 日常收费-收费功能 ryoeiken 2020-12-09 17:34:21 +0800
  • 4e56f30381 修改 生成器controller模板缺导包 与 index页面兼容性 Merge pull request !2 from dragonwzj/master 疯狂的狮子li 2020-12-09 16:49:24 +0800
  • fe39a7bc7b 模板controller导入;模板vue列表页当有查询条件时报错 wangzhijun 2020-12-09 16:16:53 +0800
  • cf7f51a633 解决多文件上传Log报错 葛瑞士 2020-12-09 16:05:09 +0800
  • 5109eb0e7e 日志输出改回相对路径 解决新版idea 编译user.dir会指定到idea配置目录下 疯狂的狮子li 2020-12-09 13:37:04 +0800
  • 583738fa65 日志输出改回相对路径 解决新版idea 编译user.dir会指定到idea配置目录下 疯狂的狮子li 2020-12-09 13:33:41 +0800
  • 55f5939808 Merge remote-tracking branch 'origin/master' into master czx 2020-12-09 11:38:12 +0800
  • 48497f5d4b 预付费问题修复 czx 2020-12-09 11:37:27 +0800
  • f96f3264f0 添加日常收费-收费功能 ryoeiken 2020-12-09 11:31:10 +0800
  • 49c93f59eb 实现首次结算的时候,提示这个病人是首次收费,不显示上次结算日期 ryoeiken 2020-12-09 10:39:23 +0800
  • 4d46f4c1b5 删除用户和角色解绑关联 RuoYi 2020-12-09 10:32:53 +0800
  • a941c1b488 !134 修改 代码生成 预览无法左右滑动 Merge pull request !134 from 〝走走停停/master 若依 2020-12-09 10:27:34 +0800
  • 206fecd2b0 添加饭堂初始化数据库 ryoeiken 2020-12-09 09:50:57 +0800
  • 4934bfa730 修改结算管理弹出层 ryoeiken 2020-12-09 08:48:09 +0800
  • 742b0ae527 修改本地开发测试数据库配置文件 ryoeiken 2020-12-09 08:25:00 +0800
  • 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