28353131@qq.com
|
d5195dfe9e
|
修复一对多bug
|
2020-12-29 22:08:22 +08:00 |
|
czx
|
1a6837f49e
|
一对多完善
|
2020-12-29 18:41:11 +08:00 |
|
ryoeiken
|
e73d581adf
|
一对多初步
|
2020-12-29 17:49:43 +08:00 |
|
ryoeiken
|
5d4451ec27
|
一对多初步
|
2020-12-29 17:49:33 +08:00 |
|
ryoeiken
|
6c80b39059
|
一对多初步
|
2020-12-29 17:48:43 +08:00 |
|
ryoeiken
|
9e3f618ce2
|
补贴详情
|
2020-12-29 17:46:45 +08:00 |
|
RuoYi
|
647af5b485
|
菜单组件修改允许空字符串
|
2020-12-29 17:27:48 +08:00 |
|
若依
|
3f33219134
|
!156 修复 用户管理 -> 修改用户 手机号码 和 邮箱 不能清空
Merge pull request !156 from li_oxen/N/A
|
2020-12-29 17:14:31 +08:00 |
|
ryoeiken
|
af23213b9c
|
修复窗口收费前端 bug
|
2020-12-29 16:26:59 +08:00 |
|
ryoeiken
|
418c8b6657
|
窗口收费
|
2020-12-29 16:18:20 +08:00 |
|
li_oxen
|
a04bb71777
|
修复 用户管理 -> 修改用户 手机号码 和 邮箱 不能清空
|
2020-12-29 13:51:15 +08:00 |
|
RuoYi
|
63992ac906
|
代码生成数据库文本类型生成表单文本域
|
2020-12-29 11:14:48 +08:00 |
|
疯狂的狮子li
|
b8f6731584
|
增加 demo模块 方便参考扩展
|
2020-12-29 10:17:44 +08:00 |
|
28353131@qq.com
|
a5bdb5072a
|
员工订餐统计接口，增加部门统计
|
2020-12-28 23:24:26 +08:00 |
|
ryoeiken
|
046aba1a2f
|
Merge remote-tracking branch 'origin/master' into master
# Conflicts:
# ruoyi-system/src/main/java/com/ruoyi/system/fantang/mapper/FtPatientDaoMapper.java
# ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SyncPatientServiceImpl.java
|
2020-12-28 16:49:18 +08:00 |
|
ryoeiken
|
af71ca6da4
|
todo：收费
|
2020-12-28 16:47:51 +08:00 |
|
czx
|
43350ad40b
|
bug：订餐配置信息
|
2020-12-28 14:17:04 +08:00 |
|
疯狂的狮子li
|
93e7f53cf8
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
|
2020-12-28 10:40:13 +08:00 |
|
czx
|
08864e17b9
|
优化员工报餐，过来周六日
|
2020-12-28 10:32:24 +08:00 |
|
RuoYi
|
0187344798
|
Excel注解支持Image图片导出
|
2020-12-27 10:04:45 +08:00 |
|
czx
|
f257ee2f6c
|
临时修改
|
2020-12-25 17:59:09 +08:00 |
|
ryoeiken
|
0704a2a51c
|
修复 日常收费 bug
|
2020-12-25 14:34:09 +08:00 |
|
疯狂的狮子li
|
c24b912b50
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
Conflicts:
ruoyi-generator/src/main/resources/vm/vue/index.vue.vm
ruoyi-ui/src/store/modules/permission.js
|
2020-12-25 09:59:24 +08:00 |
|
RuoYi
|
a9c6ba12e6
|
代码生成日期控件区分范围
|
2020-12-25 09:35:20 +08:00 |
|
28353131@qq.com
|
bb0adb833a
|
完善订餐逻辑，先删除停餐记录
|
2020-12-24 22:38:55 +08:00 |
|
RuoYi
|
ba068eae65
|
修正侧边栏静态路由丢失问题
|
2020-12-24 19:32:18 +08:00 |
|
ryoeiken
|
ff2e63e3b7
|
Merge remote-tracking branch 'origin/master' into master
|
2020-12-24 17:07:44 +08:00 |
|
ryoeiken
|
f84ce6e13f
|
病人同步
|
2020-12-24 17:07:37 +08:00 |
|
czx
|
e01edd535b
|
增加统计单日接口
|
2020-12-24 14:10:16 +08:00 |
|
czx
|
69785a0388
|
返回有效记录接口bug
|
2020-12-24 12:29:19 +08:00 |
|
czx
|
32cbe06ec6
|
优化返回有效记录接口，只返回今天以后的记录
|
2020-12-24 11:17:28 +08:00 |
|
czx
|
357eb123c9
|
返回菜单接口bug
|
2020-12-24 10:06:03 +08:00 |
|
疯狂的狮子li
|
476df3117b
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
Conflicts:
ruoyi-ui/src/utils/permission.js
ruoyi-ui/src/utils/request.js
|
2020-12-24 10:04:54 +08:00 |
|
czx
|
5f825db580
|
增加初始化员工配置记录接口
|
2020-12-24 09:17:17 +08:00 |
|
28353131@qq.com
|
ff11bbb16f
|
优化获取有效停餐记录接口，只返回今天以后的记录
|
2020-12-23 23:39:34 +08:00 |
|
28353131@qq.com
|
4064be7c50
|
优化菜谱接口，获取某一天的菜谱
|
2020-12-23 23:29:53 +08:00 |
|
28353131@qq.com
|
d903c4ebe5
|
增加今日菜单功能
|
2020-12-23 23:27:13 +08:00 |
|
ryoeiken
|
14186cc4af
|
完成 日常收费 - 收费 功能
|
2020-12-23 11:13:12 +08:00 |
|
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 |
|