czx
|
1540db84df
|
新增获取当天员工订单接口
|
2020-12-11 14:42:05 +08:00 |
|
疯狂的狮子li
|
f56f57a236
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
Conflicts:
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictDataController.java
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java
ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/LogAspect.java
ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysRoleMenuMapper.java
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysRoleServiceImpl.java
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
ruoyi-system/src/main/resources/mapper/system/SysRoleMenuMapper.xml
ruoyi-ui/package.json
ruoyi-ui/src/assets/styles/ruoyi.scss
ruoyi-ui/src/assets/styles/sidebar.scss
ruoyi-ui/src/assets/styles/variables.scss
ruoyi-ui/src/components/HeaderSearch/index.vue
ruoyi-ui/src/components/Screenfull/index.vue
ruoyi-ui/src/layout/components/Settings/index.vue
ruoyi-ui/src/layout/components/Sidebar/Logo.vue
ruoyi-ui/src/layout/components/Sidebar/SidebarItem.vue
ruoyi-ui/src/layout/components/Sidebar/index.vue
ruoyi-ui/src/layout/components/TagsView/ScrollPane.vue
ruoyi-ui/src/layout/index.vue
ruoyi-ui/src/main.js
ruoyi-ui/src/settings.js
ruoyi-ui/src/store/modules/settings.js
ruoyi-ui/src/store/modules/user.js
ruoyi-ui/src/views/login.vue
ruoyi-ui/src/views/system/user/index.vue
ruoyi-ui/src/views/system/user/profile/resetPwd.vue
ruoyi-ui/src/views/system/user/profile/userInfo.vue
ruoyi-ui/src/views/tool/gen/editTable.vue
ruoyi-ui/src/views/tool/gen/index.vue
ruoyi-ui/vue.config.js
|
2020-12-11 14:27:54 +08:00 |
|
RuoYi
|
9e387dc447
|
去除用户手机邮箱部门必填验证
|
2020-12-11 13:26:14 +08:00 |
|
若依
|
231bbf6928
|
!135 增加日志记录过滤对象类型（解决多文件场景报错）
Merge pull request !135 from geruishi/master
|
2020-12-11 13:24:03 +08:00 |
|
czx
|
fe51f511a4
|
1、修复员工登录更新状态bug
2、返回配置信息bug
|
2020-12-11 11:10:28 +08:00 |
|
RuoYi
|
d6eac2dc8d
|
前端更新插件版本
|
2020-12-11 09:27:12 +08:00 |
|
28353131@qq.com
|
a01ff2cbc4
|
员工订餐前端获取配置信息接口
|
2020-12-10 22:45:45 +08:00 |
|
28353131@qq.com
|
9e1f48d9d8
|
优化登录接口，记录登录状态，返回uuid
|
2020-12-10 21:43:33 +08:00 |
|
czx
|
89d06362a7
|
优化员工自动报餐sql，增加计算最新价格
|
2020-12-10 17:57:56 +08:00 |
|
czx
|
cb8614201d
|
添加定时器，定时生成员工订餐记录
|
2020-12-10 13:33:17 +08:00 |
|
RuoYi
|
b368ad764f
|
升级core-js到最新版本3.8.1
|
2020-12-10 12:08:18 +08:00 |
|
RuoYi
|
ffd5f0ce5d
|
升级vue-router到最新版本3.4.9
|
2020-12-10 11:14:44 +08:00 |
|
RuoYi
|
a50beae599
|
代码生成预览提供滚动机制
|
2020-12-10 11:13:39 +08:00 |
|
czx
|
84125a0f72
|
调整员工信息表结构
|
2020-12-10 09:57:29 +08:00 |
|
czx
|
31c9f6a7aa
|
Merge remote-tracking branch 'origin/master' into master
|
2020-12-09 17:48:54 +08:00 |
|
czx
|
4cb7ae256e
|
员工端登录返回
|
2020-12-09 17:48:05 +08:00 |
|
ryoeiken
|
6d4d7ef8f1
|
Merge remote-tracking branch 'origin/master' into master
|
2020-12-09 17:34:36 +08:00 |
|
ryoeiken
|
56aa0ed630
|
完善 日常收费-收费功能
|
2020-12-09 17:34:21 +08:00 |
|
疯狂的狮子li
|
4e56f30381
|
修改 生成器controller模板缺导包 与 index页面兼容性
Merge pull request !2 from dragonwzj/master
|
2020-12-09 16:49:24 +08:00 |
|
wangzhijun
|
fe39a7bc7b
|
模板controller导入；模板vue列表页当有查询条件时报错
|
2020-12-09 16:16:53 +08:00 |
|
葛瑞士
|
cf7f51a633
|
解决多文件上传Log报错
|
2020-12-09 16:05:09 +08:00 |
|
疯狂的狮子li
|
5109eb0e7e
|
日志输出改回相对路径 解决新版idea 编译user.dir会指定到idea配置目录下
|
2020-12-09 13:37:04 +08:00 |
|
疯狂的狮子li
|
583738fa65
|
日志输出改回相对路径 解决新版idea 编译user.dir会指定到idea配置目录下
|
2020-12-09 13:33:41 +08:00 |
|
czx
|
55f5939808
|
Merge remote-tracking branch 'origin/master' into master
|
2020-12-09 11:38:12 +08:00 |
|
czx
|
48497f5d4b
|
预付费问题修复
|
2020-12-09 11:37:27 +08:00 |
|
ryoeiken
|
f96f3264f0
|
添加日常收费-收费功能
|
2020-12-09 11:31:10 +08:00 |
|
ryoeiken
|
49c93f59eb
|
实现首次结算的时候，提示这个病人是首次收费，不显示上次结算日期
|
2020-12-09 10:39:23 +08:00 |
|
RuoYi
|
4d46f4c1b5
|
删除用户和角色解绑关联
|
2020-12-09 10:32:53 +08:00 |
|
若依
|
a941c1b488
|
!134 修改 代码生成 预览无法左右滑动
Merge pull request !134 from 〝走走停停/master
|
2020-12-09 10:27:34 +08:00 |
|
ryoeiken
|
206fecd2b0
|
添加饭堂初始化数据库
|
2020-12-09 09:50:57 +08:00 |
|
ryoeiken
|
4934bfa730
|
修改结算管理弹出层
|
2020-12-09 08:48:09 +08:00 |
|
ryoeiken
|
742b0ae527
|
修改本地开发测试数据库配置文件
|
2020-12-09 08:25:00 +08:00 |
|
28353131@qq.com
|
4ba16c1c1b
|
修复添加营养配餐没有餐号显示的bug
|
2020-12-08 22:42:35 +08:00 |
|
czx
|
32f30e6e57
|
Merge remote-tracking branch 'origin/master' into master
|
2020-12-08 18:14:39 +08:00 |
|
czx
|
38cf0af13a
|
增加营养配餐合并列显示
|
2020-12-08 18:13:32 +08:00 |
|
ryoeiken
|
26f6e4e264
|
CRUD开票模块
|
2020-12-08 18:12:18 +08:00 |
|
〝走走停停
|
d6b6151aea
|
update ruoyi-ui/src/assets/styles/ruoyi.scss.
|
2020-12-08 17:49:51 +08:00 |
|
RuoYi
|
fbc071a573
|
关闭页签清理缓存数据
|
2020-12-08 16:43:26 +08:00 |
|
疯狂的狮子li
|
5a62019cdd
|
更新 如何修改为Tomcat相关注释配置与说明
|
2020-12-08 16:21:30 +08:00 |
|
RuoYi
|
6cfff90b4a
|
缓存仪表图设置默认大小
|
2020-12-08 16:13:21 +08:00 |
|
RuoYi
|
474cca921e
|
回显数据字典防止空值报错
|
2020-12-08 16:12:00 +08:00 |
|
若依
|
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 +08:00 |
|
ryoeiken
|
33136439d5
|
员工性别回显
|
2020-12-08 15:10:07 +08:00 |
|
ryoeiken
|
ad876c378c
|
修改生产环境数据库地址
|
2020-12-08 15:09:36 +08:00 |
|
czx
|
2aab3d0f48
|
前端员工订餐接口定义
|
2020-12-08 11:56:06 +08:00 |
|
ryoeiken
|
e2fa131cf9
|
配餐功能营养配餐显示
|
2020-12-08 11:48:31 +08:00 |
|
ryoeiken
|
33fe8c08bb
|
完善配餐功能修改
|
2020-12-08 11:31:29 +08:00 |
|
abbfun
|
c01eeb8521
|
update ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictDataController.java.
|
2020-12-08 11:11:34 +08:00 |
|
ryoeiken
|
2cf46f7fc8
|
修复员工，护工管理查询错误
|
2020-12-08 08:12:34 +08:00 |
|
ryoeiken
|
914cc24d5b
|
Merge remote-tracking branch 'origin/master'
|
2020-12-07 23:23:48 +08:00 |
|