czx
|
fa80ce99b8
|
引入人脸识别部分代码
|
2021-01-11 11:35:38 +08:00 |
|
ryoeiken
|
a631281ba7
|
员工信息新增人面设备员工 id 字段
|
2021-01-11 10:32:54 +08:00 |
|
ryoeiken
|
2aee85ae1b
|
报餐统计
|
2021-01-11 09:00:40 +08:00 |
|
ryoeiken
|
78ee4c0278
|
报餐统计：日统计
|
2021-01-11 00:47:13 +08:00 |
|
ryoeiken
|
61ff8b7bcc
|
todo：报餐统计
|
2021-01-09 12:06:45 +08:00 |
|
ryoeiken
|
3e76d01f84
|
todo：开票，回款
|
2021-01-09 12:06:23 +08:00 |
|
ryoeiken
|
835e6dfcd0
|
会员客户端 api：获取会员主页 URL，获取会员积分，获取会员余额，获取会员代金券数量，获取会员具体项目首页 URL
|
2021-01-09 10:00:00 +08:00 |
|
czx
|
5bc16cc9d5
|
增加新的会员端接口授权
|
2021-01-09 08:41:43 +08:00 |
|
ryoeiken
|
f8e634e7fc
|
员工报餐：修改补贴订单收款，退款接口
|
2021-01-08 17:06:22 +08:00 |
|
czx
|
63d7660df3
|
临时修改
|
2021-01-08 16:32:03 +08:00 |
|
ryoeiken
|
d1b4bfc77c
|
员工报餐：修改查看补贴余额，添加补贴订单收款，补贴订单退款
|
2021-01-05 14:10:21 +08:00 |
|
ryoeiken
|
9c5fc1ba2c
|
员工报餐：用餐流水（订单）查看,获取截止订餐参数,获取菜品清单,获取订餐优惠比例
|
2021-01-05 10:50:58 +08:00 |
|
ryoeiken
|
0de0210910
|
员工报餐：查看商品清单
|
2021-01-05 09:11:59 +08:00 |
|
ryoeiken
|
7514563e6c
|
员工报餐：查看补贴余额，查看补贴记录
|
2021-01-05 08:44:59 +08:00 |
|
ryoeiken
|
64e943b681
|
todo:开票，回款
|
2021-01-04 17:32:07 +08:00 |
|
ryoeiken
|
150676a9ad
|
食品管理添加用餐类型字段
|
2021-01-04 17:27:27 +08:00 |
|
ryoeiken
|
6bd7ea834f
|
食品管理添加用餐类型字段
|
2021-01-04 17:27:03 +08:00 |
|
ryoeiken
|
4bec2d207f
|
病人配餐设置页面改造
|
2021-01-04 15:29:48 +08:00 |
|
ryoeiken
|
d04a9c5cbb
|
病人配餐默认不开启营养餐
|
2021-01-04 15:05:49 +08:00 |
|
ryoeiken
|
629e81c177
|
基本完成开票，回款登记 CRUD
|
2021-01-04 14:50:06 +08:00 |
|
ryoeiken
|
b96b7bbf41
|
新增，修改营养配餐时一同新增，修改病人配餐设置
|
2021-01-04 10:10:20 +08:00 |
|
ryoeiken
|
873bf7203a
|
Merge remote-tracking branch 'origin/master' into master
|
2020-12-31 17:24:43 +08:00 |
|
czx
|
2b23508f40
|
狮子同步最新版本
|
2020-12-31 17:22:12 +08:00 |
|
czx
|
57e016d0f1
|
Merge remote-tracking branch 'origin/master' into master
# Conflicts:
# ruoyi-admin/src/main/resources/application-dev.yml
# ruoyi-admin/src/main/resources/application-prod.yml
|
2020-12-31 17:17:36 +08:00 |
|
ryoeiken
|
416ed16118
|
病患营养配餐前端页面
|
2020-12-31 17:12:29 +08:00 |
|
czx
|
f006cb9fba
|
修复更新用餐时间配置页面bug
|
2020-12-31 14:55:13 +08:00 |
|
ryoeiken
|
6cb636ca40
|
修改参数
|
2020-12-31 14:14:30 +08:00 |
|
ryoeiken
|
2eff99e3c0
|
报餐表添加新字段
|
2020-12-31 13:42:43 +08:00 |
|
ryoeiken
|
baf88a0ea4
|
完善根据科室获取次日报餐信息
|
2020-12-31 11:42:11 +08:00 |
|
ryoeiken
|
9604f9495d
|
修复根据科室获取次日报餐信息
|
2020-12-31 10:13:57 +08:00 |
|
ryoeiken
|
81546a3b56
|
获取菜品清单
|
2020-12-31 10:04:54 +08:00 |
|
czx
|
58ea5fb983
|
发现bug
|
2020-12-31 09:41:26 +08:00 |
|
ryoeiken
|
d3ac78138a
|
饭堂参数前端页面
|
2020-12-30 17:52:10 +08:00 |
|
ryoeiken
|
595adb7ae3
|
送餐员报餐 APP 后端接口，todo：批量更新报餐记录，通知营养科更新营养配餐信息
|
2020-12-30 16:36:44 +08:00 |
|
疯狂的狮子li
|
e9d368ed0c
|
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/util/GenUtils.java
ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml
ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
|
2020-12-30 16:20:09 +08:00 |
|
ryoeiken
|
f27e2de7c1
|
更改默认报餐部门
|
2020-12-30 11:24:16 +08:00 |
|
ryoeiken
|
21f019264e
|
获取部门列表
|
2020-12-30 11:08:58 +08:00 |
|
ryoeiken
|
969b6aef37
|
添加注释
|
2020-12-30 11:05:00 +08:00 |
|
ryoeiken
|
f9a5efd406
|
护工获取默认部门信息
|
2020-12-30 10:57:17 +08:00 |
|
ryoeiken
|
339ea49928
|
护工添加手机号码及密码
|
2020-12-30 10:26:25 +08:00 |
|
ryoeiken
|
48c922a3a9
|
后端接口：获取指定病患明天的订餐记录,获取指定科室明天的报餐记录
|
2020-12-30 09:26:41 +08:00 |
|
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 |
|