RuoYi
|
6072239a40
|
修改缓存监控内存单位
|
2020-11-28 13:57:19 +08:00 |
|
28353131@qq.com
|
e3c0bc3c5c
|
1、完善每周菜谱功能，用户不能添加和删除
2、列表中增加合并列显示效果
3、增加菜品列表
|
2020-11-28 12:53:37 +08:00 |
|
RuoYi
|
a3b86d6f6d
|
代码生成删除多余的数字float类型
|
2020-11-28 12:09:24 +08:00 |
|
RuoYi
|
fd831d5a90
|
Excel支持导入Boolean型数据
|
2020-11-28 12:08:55 +08:00 |
|
28353131@qq.com
|
bac94b2f03
|
修改每周菜谱数据类型，对应修改实体类
|
2020-11-28 11:16:34 +08:00 |
|
czx
|
797a9c3cd8
|
Merge remote-tracking branch 'origin/master' into master
|
2020-11-27 17:48:10 +08:00 |
|
czx
|
6864c23124
|
增加填写同步日志功能
|
2020-11-27 17:47:34 +08:00 |
|
ryoeiken
|
737186308d
|
Merge remote-tracking branch 'origin/master' into master
|
2020-11-27 17:28:32 +08:00 |
|
ryoeiken
|
c696a03232
|
添加每周食谱
|
2020-11-27 17:28:17 +08:00 |
|
czx
|
0ef4ec268e
|
增加填充新病患的报餐默认配置数据
|
2020-11-27 17:13:41 +08:00 |
|
ryoeiken
|
7ab0d24e50
|
添加病人报餐
|
2020-11-26 16:32:01 +08:00 |
|
ryoeiken
|
000f94049b
|
添加默认报餐表总价格
|
2020-11-26 15:45:18 +08:00 |
|
ryoeiken
|
02229ed732
|
默认报餐表显示
|
2020-11-26 15:00:44 +08:00 |
|
czx
|
820bb00831
|
完善远程病患同步逻辑
|
2020-11-26 14:29:20 +08:00 |
|
czx
|
63d72d7f51
|
完成同步远程病患数据到本地
|
2020-11-26 11:29:02 +08:00 |
|
czx
|
a2798f7a1f
|
不同数据源切换同步远程病患到本地
|
2020-11-26 09:33:32 +08:00 |
|
ryoeiken
|
c91b0f55e5
|
默认报餐
|
2020-11-26 00:40:17 +08:00 |
|
ryoeiken
|
552abab811
|
Merge remote-tracking branch 'origin/master'
|
2020-11-26 00:34:50 +08:00 |
|
ryoeiken
|
b8428b09fe
|
默认报餐
|
2020-11-26 00:34:39 +08:00 |
|
28353131@qq.com
|
0bb383d7c2
|
多数据源，远程病人信息表
|
2020-11-25 23:09:02 +08:00 |
|
czx
|
a65761757b
|
Merge remote-tracking branch 'origin/master' into master
# Conflicts:
# ruoyi-admin/src/main/resources/application-dev.yml
|
2020-11-25 17:59:06 +08:00 |
|
czx
|
0cd78a6b7c
|
多数据源配置
|
2020-11-25 17:58:14 +08:00 |
|
ryoeiken
|
86c1094e34
|
默认报餐表
|
2020-11-25 17:55:06 +08:00 |
|
ryoeiken
|
0e13b03072
|
Merge remote-tracking branch 'origin/master' into master
|
2020-11-25 16:19:01 +08:00 |
|
czx
|
6dbe2daa24
|
删除护工信息列表多余内容
|
2020-11-25 16:08:32 +08:00 |
|
czx
|
9b3fe8d6ee
|
修复护工绑定科室多选问题
|
2020-11-25 15:54:03 +08:00 |
|
ryoeiken
|
b4e7c3f2a7
|
Merge remote-tracking branch 'origin/master' into master
|
2020-11-25 15:50:11 +08:00 |
|
czx
|
783dc47a84
|
修复护工绑定科室多选问题
|
2020-11-25 15:46:53 +08:00 |
|
ryoeiken
|
ee17361cda
|
Merge remote-tracking branch 'origin/master' into master
|
2020-11-25 15:14:19 +08:00 |
|
czx
|
913ced8791
|
修复启用状态回显bug
|
2020-11-25 11:19:59 +08:00 |
|
ryoeiken
|
82fe6d5c34
|
多数据源配置
|
2020-11-25 10:31:14 +08:00 |
|
ryoeiken
|
a35a2ff6f2
|
人员管理,财务管理-补贴管理
|
2020-11-25 09:40:14 +08:00 |
|
疯狂的狮子li
|
6d900dc654
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
|
2020-11-25 09:30:42 +08:00 |
|
ryoeiken
|
7cdb38b7c9
|
员工管理护工管理数据分离
|
2020-11-24 23:17:51 +08:00 |
|
ryoeiken
|
64bd494733
|
人员管理
|
2020-11-24 17:56:12 +08:00 |
|
RuoYi
|
e83412b9a5
|
升级oshi到最新版本v5.3.6
|
2020-11-24 16:17:33 +08:00 |
|
疯狂的狮子li
|
15c4428b9c
|
修改 ruoyi CharsetKit.java bug
|
2020-11-24 11:54:38 +08:00 |
|
疯狂的狮子li
|
20d7c90515
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
Conflicts:
ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/ServerController.java
ruoyi-ui/src/views/system/user/profile/userAvatar.vue
sql/ry_20201123.sql
|
2020-11-24 10:03:59 +08:00 |
|
RuoYi
|
90ac416e02
|
新增缓存监控功能
|
2020-11-23 10:02:50 +08:00 |
|
ryoeiken
|
78f06ed7e2
|
修改前端页面
|
2020-11-19 15:52:46 +08:00 |
|
ryoeiken
|
3d3188e399
|
自动生成 CRUD
|
2020-11-19 15:15:23 +08:00 |
|
ryoeiken
|
212b781352
|
配置文件初始化
|
2020-11-19 10:31:06 +08:00 |
|
RuoYi
|
5b63f0cab9
|
优化头像样式，鼠标移入悬停遮罩
|
2020-11-19 09:33:10 +08:00 |
|
疯狂的狮子li
|
3363d7b12d
|
同步升级 3.2.1 修复重大bug 阻止任意文件下载漏洞
|
2020-11-18 10:52:33 +08:00 |
|
疯狂的狮子li
|
ff563c44e2
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
Conflicts:
ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CommonController.java
ruoyi-admin/src/main/resources/application.yml
ruoyi-common/src/main/java/com/ruoyi/common/constant/GenConstants.java
ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileUtils.java
ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenTableColumn.java
ruoyi-generator/src/main/java/com/ruoyi/generator/util/GenUtils.java
ruoyi-generator/src/main/resources/vm/vue/index.vue.vm
ruoyi-ui/package.json
ruoyi-ui/src/views/index.vue
ruoyi-ui/src/views/tool/gen/editTable.vue
|
2020-11-18 10:41:13 +08:00 |
|
RuoYi
|
8f145bba3a
|
若依 v3.2.1
|
2020-11-18 09:32:15 +08:00 |
|
RuoYi
|
6bb166b89f
|
阻止任意文件下载漏洞
|
2020-11-17 10:29:52 +08:00 |
|
RuoYi
|
823e95667e
|
代码生成支持上传控件
|
2020-11-16 16:20:17 +08:00 |
|
RuoYi
|
566053da0c
|
新增图片上传组件
|
2020-11-16 15:52:58 +08:00 |
|
疯狂的狮子li
|
527decb7fa
|
更新 undertow 配置
|
2020-11-16 14:50:05 +08:00 |
|