abu/wzj-boot
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
518 Commits 4 Branches 22 Tags
Commit Graph

56 Commits

Author SHA1 Message Date
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
ryoeiken
86c1094e34 默认报餐表 2020-11-25 17:55:06 +08:00
czx
783dc47a84 修复护工绑定科室多选问题 2020-11-25 15:46:53 +08:00
czx
913ced8791 修复启用状态回显bug 2020-11-25 11:19:59 +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
疯狂的狮子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
69256940df 若依 3.2 2020-10-10 09:38:21 +08:00
疯狂的狮子li
bd39b971cf Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue 
 Conflicts:
	ruoyi-admin/src/main/resources/application.yml
	ruoyi-ui/package.json
	ruoyi-ui/src/utils/ruoyi.js
	ruoyi-ui/src/views/monitor/job/index.vue
 2020-10-10 09:19:20 +08:00
疯狂的狮子li
aefa2095f0 Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue 
 Conflicts:
	ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysLogininforController.java
	ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysMenu.java
	ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysRole.java
	ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java
	ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginUser.java
	ruoyi-framework/src/main/java/com/ruoyi/framework/manager/factory/AsyncFactory.java
	ruoyi-generator/src/main/resources/vm/sql/sql.vm
	ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/MetaVo.java
	ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDeptMapper.java
	ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysMenuMapper.java
	ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java
	ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java
	ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml
	ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml
	ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml
	ruoyi-ui/src/assets/styles/ruoyi.scss
	ruoyi-ui/src/router/index.js
	ruoyi-ui/src/views/system/menu/index.vue
	ruoyi-ui/src/views/system/role/index.vue
	ruoyi-ui/src/views/system/user/index.vue
	sql/ry_20200920.sql
 2020-09-22 13:22:30 +08:00
RuoYi
69829827fe 菜单&数据权限新增（展开/折叠 全选/全不选 父子联动） 2020-09-21 14:10:01 +08:00
wensanpi
1aa18c523d update ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml. 2020-09-20 17:38:21 +08:00
RuoYi
abeb8d7fd8 菜单新增是否缓存keep-alive 2020-09-20 10:34:03 +08:00
RuoYi
478fae0d28 菜单&数据权限新增（展开/折叠 全选/全不选 父子联动） 2020-09-19 13:42:37 +08:00
疯狂的狮子li
298fabfdec Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue 
 Conflicts:
	ruoyi-generator/src/main/java/com/ruoyi/generator/controller/GenController.java
	ruoyi-generator/src/main/java/com/ruoyi/generator/mapper/GenTableColumnMapper.java
	ruoyi-generator/src/main/java/com/ruoyi/generator/service/GenTableServiceImpl.java
	ruoyi-generator/src/main/java/com/ruoyi/generator/service/IGenTableService.java
	ruoyi-generator/src/main/resources/mapper/generator/GenTableColumnMapper.xml
	ruoyi-generator/src/main/resources/mapper/generator/GenTableMapper.xml
	ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
	ruoyi-ui/src/api/tool/gen.js
	ruoyi-ui/src/assets/styles/ruoyi.scss
	ruoyi-ui/src/views/system/user/index.vue
	ruoyi-ui/src/views/tool/gen/index.vue
 2020-09-18 17:38:23 +08:00
RuoYi
0ecf27f8d6 去除多余的空格 2020-09-18 17:09:27 +08:00
疯狂的狮子li
b111cbeedd Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue 
 Conflicts:
	ruoyi-common/src/main/java/com/ruoyi/common/constant/GenConstants.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-system/src/main/java/com/ruoyi/system/service/impl/SysConfigServiceImpl.java
	ruoyi-ui/src/views/tool/gen/editTable.vue
 2020-09-16 09:23:02 +08:00
RuoYi
57b49dd5fa 限制系统内置参数不允许删除 2020-09-15 15:51:12 +08:00
疯狂的狮子li
06c4d4d01b Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue 
 Conflicts:
	pom.xml
	ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/MetaVo.java
	ruoyi-system/src/main/resources/mapper/system/SysNoticeMapper.xml
	ruoyi-ui/package.json
	ruoyi-ui/src/components/Editor/index.vue
	ruoyi-ui/src/router/index.js
 2020-09-11 09:17:43 +08:00
RuoYi
9c0ed9c424 修复通知公告longblob类型乱码问题 2020-09-10 18:23:12 +08:00
RuoYi
aeb02c79d8 修正注释图标路径 2020-09-10 16:53:58 +08:00
疯狂的狮子li
ef95cec77f Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue 
 Conflicts:
	ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/DataScopeAspect.java
	ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictTypeServiceImpl.java
	ruoyi-ui/src/components/Editor/index.vue
 2020-09-07 11:31:40 +08:00
RuoYi
50ac363682 升级druid到最新版本v1.1.23 2020-09-04 14:47:07 +08:00
dawn
3fd9147afb 解决“在只填加了字典类型，没有添加字典数据时，会出现缓存了空集合，即使后边添加了字典数据也没用，只能清空redis缓存。”的问题，小问题就是判断稍稍改了下，若依大大让我pr当个贡献者，很荣幸很欣慰。感谢！ 2020-09-02 10:14:34 +08:00
疯狂的狮子li
1ef17bb582 Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue 
 Conflicts:
	ruoyi-common/src/main/java/com/ruoyi/common/constant/GenConstants.java
	ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/DataScopeAspect.java
	ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java
	ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java
 2020-08-31 09:12:13 +08:00
RuoYi
068c3e6f0d 优化递归子节点 2020-08-28 10:14:59 +08:00
疯狂的狮子li
088bc98a43 Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue 
 Conflicts:
	ruoyi-admin/src/main/resources/application.yml
	ruoyi-ui/package.json
 2020-08-13 11:24:04 +08:00
RuoYi
8f9f0c04cc 若依 3.1 2020-08-13 10:27:56 +08:00
疯狂的狮子li
a9f4a4e111 Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue 
 Conflicts:
	.gitignore
	ruoyi-common/src/main/java/com/ruoyi/common/utils/spring/SpringUtils.java
	ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserOnlineServiceImpl.java
	ruoyi-system/src/main/resources/mapper/system/SysConfigMapper.xml
	ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml
	ruoyi-system/src/main/resources/mapper/system/SysDictTypeMapper.xml
	ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml
	ruoyi-system/src/main/resources/mapper/system/SysPostMapper.xml
	ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml
	ruoyi-system/src/main/resources/mapper/system/SysRoleMenuMapper.xml
	ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
	ruoyi-ui/src/utils/request.js
	ruoyi-ui/src/utils/ruoyi.js
 2020-08-07 09:22:36 +08:00
RuoYi
51fa66f61a 唯一限制条件只返回单条数据 2020-08-05 14:28:45 +08:00
liguonan
de2ac66f0b 修复在线用户判断逻辑 2020-08-03 17:57:33 +08:00