511 Commits

Author SHA1 Message Date
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
ryoeiken
7cdb38b7c9 员工管理护工管理数据分离 2020-11-24 23:17:51 +08:00
ryoeiken
64bd494733 人员管理 2020-11-24 17:56:12 +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
疯狂的狮子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
疯狂的狮子li
03f0e3a137 为所有MP插件和配置增加官方链接 2020-11-16 14:12:14 +08:00
疯狂的狮子li
148d0361e0 增加字段填充配置 2020-11-16 14:03:55 +08:00
疯狂的狮子li
d626dd9e90 更新分页插件配置 增加主键插件配置 2020-11-16 13:57:26 +08:00
疯狂的狮子li
1043afcecc 重磅升级 Mybatis-Plus 升级为 3.4.1 2020-11-13 11:39:16 +08:00
疯狂的狮子li
04d1154be0 重磅升级 重写 Mybatis-Plus 配置文件 根据官方文档详细注释 2020-11-13 11:18:37 +08:00
疯狂的狮子li
550f781d6f 重磅升级 Mybatis-Plus 插件 全部升级为最新插件 2020-11-13 11:17:33 +08:00
疯狂的狮子li
b114d0a41c 重磅升级 Mybatis-Plus 升级为 3.4.1 Hutool 升级到 5.4.0 2020-11-13 11:16:57 +08:00
疯狂的狮子li
60dda6c7eb Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
 Conflicts:
	ruoyi-ui/src/views/index.vue
2020-11-12 09:24:40 +08:00
RuoYi
0ef007240d 调整默认首页 2020-11-07 10:38:35 +08:00
疯狂的狮子li
c57005b4e4 Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue 2020-11-06 17:18:55 +08:00
RuoYi
0a75dcdd85 升级druid到最新版本v1.2.2 2020-11-05 13:58:36 +08:00
疯狂的狮子li
93093d9f55 更改 MybatisPlus Lambda查询 改为官方推荐写法 2020-11-05 13:56:49 +08:00
疯狂的狮子li
e095a9f73f Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue 2020-11-05 12:58:53 +08:00
RuoYi
4c2626ffec 2020年双十一云服务器优惠,错过又要等一年 2020-11-04 16:58:28 +08:00
疯狂的狮子li
5d748a50ff 删除 MyBatisConfig.java 配置文件 2020-11-03 09:58:01 +08:00
疯狂的狮子li
efb938c370 Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
 Conflicts:
	ruoyi-framework/src/main/java/com/ruoyi/framework/config/MyBatisConfig.java
	ruoyi-ui/src/views/system/notice/index.vue
	ruoyi-ui/src/views/system/user/index.vue
2020-11-03 09:56:18 +08:00
RuoYi
082b19e33a mapperLocations配置支持分隔符 2020-11-02 17:34:52 +08:00