opensource/RuoYi-Vue-Plus
2
0
Fork 1
mirror of https://gitee.com/dromara/RuoYi-Vue-Plus.git synced 2026-09-19 09:55:16 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity
969 Commits 2 Branches 11 Tags 149 MiB
aee23629ea
Commit Graph

969 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
czx
5273d1d669 完善病患营养配餐“暂停”功能 2021-01-18 17:58:30 +08:00
czx
7026d78c34 完善病患营养配餐“拷贝新增”功能 2021-01-18 16:27:17 +08:00
疯狂的狮子li
09acac4caf 更新readme 2021-01-18 16:13:05 +08:00
疯狂的狮子li
9fdee373af 删除多余注解(@Data已包含) 2021-01-18 14:00:03 +08:00
czx
e8c7cecdce 优化：营养配餐页面，新增病患按钮，切换科室后，下来病患列表采用自定义显示，增加床号信息。 2021-01-18 10:44:26 +08:00
czx
3028d74ac9 优化：切换科室时，筛选所有没有配置营养配餐的病患列表； 2021-01-18 10:38:46 +08:00
czx
1859407349 数据结构增加暂停字段 2021-01-18 10:21:35 +08:00
ryoeiken
3c47781540 todo:营养餐 2021-01-15 17:43:45 +08:00
疯狂的狮子li
3362ce5f33 升级 MybatisPlus 3.4.2 2021-01-15 15:55:24 +08:00
ryoeiken
4bb136057d todo:报餐统计 2021-01-15 15:41:01 +08:00
ryoeiken
71cef3f7e2 todo:开票回款 2021-01-15 15:40:49 +08:00
ryoeiken
c6f2967e70 todo:营养餐 2021-01-15 15:40:33 +08:00
疯狂的狮子li
52325307f4 Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue 
 Conflicts:
	README.md
 2021-01-15 15:08:50 +08:00
czx
a8a1b53794 优化：初始化病患数据时，默认将加餐状态设置为禁用 2021-01-15 10:52:32 +08:00
czx
7fa65bfe15 修改默认病人生成记录，早午晚加四餐全部启用状态 2021-01-14 16:15:59 +08:00
czx
5e8ac3b417 修改默认病人生成记录，早午晚加四餐全部启用状态 2021-01-14 16:13:16 +08:00
czx
ca96acdfd2 增加明天报餐的预测统计接口 2021-01-14 13:55:54 +08:00
RuoYi
cca2f5c62d update README.md 2021-01-14 13:20:08 +08:00
ryoeiken
c973e28951 修改开发环境数据库链连接 2021-01-14 10:31:07 +08:00
RuoYi
ce54416e4f 升级fastjson到最新版1.2.75 2021-01-13 16:20:39 +08:00
RuoYi
bd19892aff 修复生成树表代码异常 2021-01-13 16:19:23 +08:00
ryoeiken
77b1ce9dd3 修复报餐信息表页面错误 2021-01-13 16:07:31 +08:00
ryoeiken
647bb9d69d 已核销的订单不能进行删除 2021-01-13 16:04:33 +08:00
ryoeiken
d0191ba05d 管理页面添加人脸识别设备管理，完善人脸识别核销接口 2021-01-13 15:20:34 +08:00
ryoeiken
5efc76dfc8 员工报餐 api：人脸核销，清空停餐信息 2021-01-13 11:43:38 +08:00
czx
7782d98641 优化用餐时间判定类 2021-01-13 09:16:00 +08:00
czx
6083931b6d 人脸临时修改 2021-01-12 16:32:55 +08:00
ryoeiken
172dd0dcd3 api：今明日报餐统计 2021-01-12 15:05:38 +08:00
ryoeiken
4a7b400569 修复添加病人后没有生成病人配餐设置 2021-01-12 10:31:16 +08:00
ryoeiken
98ad6c297e 病患报餐 api：报餐统计 2021-01-11 17:47:14 +08:00
ryoeiken
3b87010f24 todo：报餐统计总数 2021-01-11 16:09:30 +08:00
ryoeiken
06f199f3c3 修复病人配餐设置启用状态 2021-01-11 15:12:17 +08:00
czx
86c654904a 加入统计分页操作（未完） 2021-01-11 14:37:45 +08:00
ryoeiken
c726fb7b60 todo：报餐统计分页 2021-01-11 13:46:34 +08:00
czx
e69d57e1a1 引入人脸识别部分代码 2021-01-11 11:48:14 +08:00
czx
545383ed28 Merge remote-tracking branch 'origin/master' into master 2021-01-11 11:37:14 +08:00
czx
fa80ce99b8 引入人脸识别部分代码 2021-01-11 11:35:38 +08:00
ryoeiken
4415a55369 人脸信息 CRUD 2021-01-11 10:45:30 +08:00
ryoeiken
a631281ba7 员工信息新增人面设备员工 id 字段 2021-01-11 10:32:54 +08:00
疯狂的狮子li
684eadbcc6 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/controller/GenController.java
	ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenTable.java
	ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenTableColumn.java
	ruoyi-generator/src/main/java/com/ruoyi/generator/mapper/GenTableMapper.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/java/com/ruoyi/generator/util/VelocityInitializer.java
	ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityUtils.java
	ruoyi-generator/src/main/resources/mapper/generator/GenTableMapper.xml
	ruoyi-generator/src/main/resources/vm/java/controller.java.vm
	ruoyi-generator/src/main/resources/vm/java/domain.java.vm
	ruoyi-generator/src/main/resources/vm/java/mapper.java.vm
	ruoyi-generator/src/main/resources/vm/java/serviceImpl.java.vm
	ruoyi-generator/src/main/resources/vm/vue/index.vue.vm
	ruoyi-generator/src/main/resources/vm/xml/mapper.xml.vm
	ruoyi-ui/src/views/system/user/index.vue
	ruoyi-ui/src/views/tool/gen/editTable.vue
	ruoyi-ui/src/views/tool/gen/genInfoForm.vue
	ruoyi-ui/src/views/tool/gen/index.vue
	sql/ry_20210108.sql
 2021-01-11 09:58:41 +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
RuoYi
14a859899c 代码生成模板支持主子表 2021-01-08 10:47:36 +08:00
若依
f3cb18c836 !161 修复导入数据为负浮点数时，导入结果会丢失精度问题 
Merge pull request !161 from 嘿白熊/master
 2021-01-08 10:46:36 +08:00