885 Commits

Author SHA1 Message Date
ryoeiken
422bd341ef 修复 日常收费 - 收费 清空选择日期时错误 2020-12-23 08:17:36 +08:00
ryoeiken
21416475a2 收费页面弹出层 2020-12-22 18:00:07 +08:00
若依
1a87ee7c19 防止get请求参数值为false或0等特殊值会导致无法正确的传参
Merge pull request !146 from wugh/hotfix/gitee-issue_I2A5FU
2020-12-22 16:19:51 +08:00
ryoeiken
f0ac254e43 修复 日常收费 - 收费 弹出层错误 2020-12-22 11:22:02 +08:00
ryoeiken
ef75dedb13 补贴流水列表回显,修复搜索框显示选择字典 2020-12-22 09:24:11 +08:00
ryoeiken
f29a047f54 修复员工,护工管理页面错误 2020-12-22 08:44:18 +08:00
ryoeiken
29b33f393d Merge remote-tracking branch 'origin/master' into master 2020-12-22 08:40:23 +08:00
ryoeiken
cd24108d93 修改补贴发放提示 2020-12-22 08:40:16 +08:00
DokiYoloo
3c4b01ab83 权限工具类增加admin判断 2020-12-21 19:43:57 +08:00
czx
bb45ccb720 Merge remote-tracking branch 'origin/master' into master 2020-12-21 17:54:46 +08:00
czx
16afb20621 修改员工登出功能 2020-12-21 17:54:11 +08:00
ryoeiken
f1040fcf40 修复错误 2020-12-21 17:43:03 +08:00
ryoeiken
85747dc9a1 修复前端补贴发放标志不能修改错误 并 根据发放标志插入记录,显示在职员工, 2020-12-21 17:41:53 +08:00
ryoeiken
742ce42f5e 发放日期判断 2020-12-21 17:08:11 +08:00
ryoeiken
e54f23dd05 Merge remote-tracking branch 'origin/master' into master 2020-12-21 16:59:26 +08:00
ryoeiken
aa4289245f 补贴发放 2020-12-21 16:59:16 +08:00
czx
fd7108f412 优化获取用餐信息的接口 2020-12-21 15:54:44 +08:00
czx
96b6b349dc 新增员工停餐接口 2020-12-21 14:48:57 +08:00
czx
6675d80a92 Merge remote-tracking branch 'origin/master' into master 2020-12-21 14:08:31 +08:00
czx
638ad47e35 新增员工订单生成和取消接口 2020-12-21 14:08:13 +08:00
ryoeiken
de0117271d Update .gitignore 2020-12-21 13:53:45 +08:00
ryoeiken
68778311e8 修复订单管理页面 2020-12-21 13:51:52 +08:00
疯狂的狮子li
1000a577d0 配置文件新增redis数据库索引属性 2020-12-21 11:58:49 +08:00
wugh
886ce995af [bug修复] 解决get请求,如果参数值为false或0等特殊值会导致无法正确传参 2020-12-21 11:58:15 +08:00
疯狂的狮子li
78ef398257 Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
 Conflicts:
	ruoyi-admin/src/main/resources/application.yml
	ruoyi-ui/src/store/modules/permission.js
2020-12-21 11:55:32 +08:00
czx
9e62938b1f 修改获取员工订餐配置信息记录方式 2020-12-21 11:54:05 +08:00
RuoYi
52264b6e2a 优化多级菜单之间切换无法缓存的问题 2020-12-21 10:50:48 +08:00
RuoYi
fd7e88a518 配置文件新增redis数据库索引属性 2020-12-21 10:26:54 +08:00
若依
854a6f805f !145 redis 增加 database配置项,设置不同的库
Merge pull request !145 from li_oxen/N/A
2020-12-21 10:13:47 +08:00
li_oxen
1caec85f46 redis 增加 database配置项,设置不同的库 2020-12-19 10:08:09 +08:00
czx
690b4e56e8 新增返回员工某一日的订单接口 2020-12-18 17:53:51 +08:00
疯狂的狮子li
805c79506b 代码生成 后端支持 between 2020-12-18 17:46:05 +08:00
疯狂的狮子li
817da5bc04 修复export与list结果不统一问题 2020-12-18 16:50:58 +08:00
wangxianl
a514330db3 修复export与list结果不统一的问题 2020-12-18 15:47:07 +08:00
czx
979a450afd 新增返回员工某一日的订单接口 2020-12-18 14:51:58 +08:00
疯狂的狮子li
2b0cf24be4 修改 controller 生成器 解决where条件重复bug 2020-12-18 09:47:35 +08:00
疯狂的狮子li
6c8497f632 Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
 Conflicts:
	ruoyi-ui/package.json
	ruoyi-ui/src/components/Breadcrumb/index.vue
	ruoyi-ui/src/layout/components/AppMain.vue
	ruoyi-ui/src/layout/components/Sidebar/index.vue
	ruoyi-ui/src/layout/components/TagsView/index.vue
	ruoyi-ui/src/store/getters.js
	ruoyi-ui/src/store/modules/permission.js
	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
2020-12-18 09:45:54 +08:00
疯狂的狮子li
b029a7265a 将controller条件查询器改完隐式泛型 2020-12-18 00:02:40 +08:00
czx
81d88da5d1 新增返回全部订单接口 2020-12-17 18:00:01 +08:00
czx
9dc5505422 完成同步更新三个逻辑 2020-12-17 16:13:51 +08:00
RuoYi
c86dc20743 移除path-to-regexp正则匹配插件 2020-12-17 12:05:29 +08:00
ryoeiken
bb88724e20 饭堂系统信息 CRUD 2020-12-17 09:21:46 +08:00
ryoeiken
aee6b69d3e Merge remote-tracking branch 'origin/master' into master 2020-12-17 09:09:30 +08:00
RuoYi
ecc7a8be46 优化多级菜单之间切换无法缓存的问题 2020-12-16 20:57:48 +08:00
czx
7c0331b7b6 修复员工订单bug 2020-12-16 17:30:15 +08:00
疯狂的狮子li
f44ff8477f Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
 Conflicts:
	README.md
	ruoyi-common/src/main/java/com/ruoyi/common/filter/XssHttpServletRequestWrapper.java
	ruoyi-framework/src/main/java/com/ruoyi/framework/config/RedisConfig.java
2020-12-16 12:44:21 +08:00
RuoYi
e23ad20186 README 2020-12-16 10:20:02 +08:00
RuoYi
6cf2a8edeb 升级SpringBoot到最新版本2.2.12 提升启动速度 2020-12-16 10:05:53 +08:00
疯狂的狮子li
1249c7ca26 Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
 Conflicts:
	ruoyi-ui/src/permission.js
	ruoyi-ui/src/views/login.vue
2020-12-15 10:25:00 +08:00
RuoYi
67198aede9 README 2020-12-15 10:06:12 +08:00