28353131@qq.com
|
0e571bde22
|
病患配餐列表中增加正餐菜品名回显
|
2020-12-03 23:16:28 +08:00 |
|
ryoeiken
|
e6e6a94784
|
搭建病患配餐页面
|
2020-12-03 18:11:09 +08:00 |
|
ryoeiken
|
a8567345c9
|
完善营养套餐管理
|
2020-12-03 17:32:17 +08:00 |
|
ryoeiken
|
5da5451cbc
|
营养配餐设置功能页面
|
2020-12-03 16:02:32 +08:00 |
|
czx
|
107def44eb
|
Merge remote-tracking branch 'origin/master' into master
|
2020-12-03 14:36:18 +08:00 |
|
ryoeiken
|
6d342a00ca
|
修改病人配餐设置管理,病人营养配餐管理
|
2020-12-03 14:35:43 +08:00 |
|
RuoYi
|
0e2b97a886
|
升级poi到最新版本4.1.2
|
2020-12-03 13:28:04 +08:00 |
|
RuoYi
|
1c7a5faae8
|
Excel支持注解align对齐方式
|
2020-12-03 13:26:46 +08:00 |
|
疯狂的狮子li
|
d2cef9c40d
|
新增 关于多数据源事务
|
2020-12-03 11:32:29 +08:00 |
|
疯狂的狮子li
|
b346036cca
|
增加 多数据源事务描述
|
2020-12-03 11:30:48 +08:00 |
|
疯狂的狮子li
|
5ebd0a971f
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
|
2020-12-03 11:20:50 +08:00 |
|
疯狂的狮子li
|
c50e058953
|
为所有MP插件增加官方链接
|
2020-12-03 11:15:54 +08:00 |
|
疯狂的狮子li
|
a3dfa843af
|
增加 多数据源使用注意事项
|
2020-12-03 11:13:58 +08:00 |
|
RuoYi
|
23868c4fad
|
防止安全扫描YUI出现的风险提示
|
2020-12-03 10:26:22 +08:00 |
|
czx
|
a5b4cc6c18
|
修复每周菜谱翻页异常bug
|
2020-12-03 09:39:43 +08:00 |
|
czx
|
54ff1d29ef
|
结算收款功能
|
2020-12-02 17:47:12 +08:00 |
|
czx
|
85716eb8d8
|
结算收款功能(未完)
|
2020-12-02 14:34:36 +08:00 |
|
czx
|
81a2e5578e
|
防止预付费重复收款
|
2020-12-02 09:50:23 +08:00 |
|
czx
|
1f89abf51d
|
更新系统标题相关内容
|
2020-12-02 08:52:48 +08:00 |
|
czx
|
970a194347
|
导入getuser包
|
2020-12-01 17:45:28 +08:00 |
|
czx
|
a5107c5a44
|
Merge remote-tracking branch 'origin/master' into master
|
2020-12-01 17:42:02 +08:00 |
|
ryoeiken
|
26e0c50d96
|
Merge remote-tracking branch 'origin/master' into master
|
2020-12-01 17:41:18 +08:00 |
|
ryoeiken
|
ff8737de03
|
结算管理后端获取最近一次结算时间以及距当前时间的天数
|
2020-12-01 17:41:06 +08:00 |
|
czx
|
e2ad86e682
|
增加判断是否已经支付预付伙食费(未完)
|
2020-12-01 16:55:57 +08:00 |
|
czx
|
43b05b9781
|
数据库结构调整createby int --> varchar
|
2020-12-01 16:39:00 +08:00 |
|
czx
|
147dbe0e15
|
修复每周菜谱自动计价功能bug
|
2020-12-01 16:07:35 +08:00 |
|
czx
|
d61517cf46
|
Merge remote-tracking branch 'origin/master' into master
|
2020-12-01 15:30:44 +08:00 |
|
czx
|
0b5b7db96d
|
临时
|
2020-12-01 15:30:17 +08:00 |
|
ryoeiken
|
b94f753ae5
|
Merge remote-tracking branch 'origin/master' into master
|
2020-12-01 15:29:00 +08:00 |
|
ryoeiken
|
03169452d8
|
预付费结算判断
|
2020-12-01 15:28:46 +08:00 |
|
czx
|
af6b5546c9
|
结算管理页面调整
|
2020-12-01 15:26:37 +08:00 |
|
疯狂的狮子li
|
2afb109bff
|
增加 maven多环境配置注释
|
2020-12-01 11:53:55 +08:00 |
|
疯狂的狮子li
|
f7f7557d4d
|
项目修改为 maven多环境配置
|
2020-12-01 11:44:29 +08:00 |
|
疯狂的狮子li
|
b36b413a69
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
|
2020-12-01 09:23:55 +08:00 |
|
RuoYi
|
3b2669d148
|
修改缓存监控内存单位
|
2020-11-30 19:27:03 +08:00 |
|
czx
|
d708c734df
|
增加查询结算记录(未完)
|
2020-11-30 18:05:14 +08:00 |
|
czx
|
8657a73b92
|
修复添加预收费记录默认数据不完整
|
2020-11-30 15:06:17 +08:00 |
|
czx
|
b4cfb9cb80
|
完成预付费收费功能
|
2020-11-30 14:27:06 +08:00 |
|
疯狂的狮子li
|
ce438f182a
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
Conflicts:
ruoyi-common/src/main/java/com/ruoyi/common/constant/GenConstants.java
ruoyi-common/src/main/java/com/ruoyi/common/constant/UserConstants.java
ruoyi-common/src/main/java/com/ruoyi/common/core/text/CharsetKit.java
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java
ruoyi-ui/package.json
ruoyi-ui/src/layout/components/AppMain.vue
ruoyi-ui/src/layout/components/TagsView/index.vue
ruoyi-ui/src/router/index.js
ruoyi-ui/src/store/modules/permission.js
ruoyi-ui/src/views/system/user/profile/userAvatar.vue
sql/ry_20201128.sql
|
2020-11-30 12:41:39 +08:00 |
|
czx
|
147b7d8896
|
预付款输入框控制正整数输入
|
2020-11-30 11:50:00 +08:00 |
|
czx
|
3e1b7163b0
|
收费弹出层关联选择按钮
|
2020-11-30 11:38:54 +08:00 |
|
czx
|
f248b7d4af
|
预付费管理模块增加结算类型切换
|
2020-11-30 11:24:12 +08:00 |
|
RuoYi
|
1147ea5f8a
|
设置用户头像悬停高度
|
2020-11-30 11:10:27 +08:00 |
|
RuoYi
|
a1bf5aaf8e
|
升级element-ui版本到2.14.1
|
2020-11-30 10:37:48 +08:00 |
|
RuoYi
|
2797c1eb3a
|
修正转换字符串的目标字符集属性
|
2020-11-30 10:31:11 +08:00 |
|
若依
|
1791d7cf40
|
!126 update pom.xml.
Merge pull request !126 from abbfun/N/A
|
2020-11-30 10:07:08 +08:00 |
|
28353131@qq.com
|
acf6cf7298
|
修复bug
|
2020-11-29 17:03:42 +08:00 |
|
28353131@qq.com
|
63e2052b9a
|
改造实现输入建议内容
|
2020-11-29 16:49:26 +08:00 |
|
abbfun
|
01861f0aae
|
update pom.xml.
|
2020-11-29 16:16:54 +08:00 |
|
28353131@qq.com
|
0d16f9158a
|
初步改造前端页面
|
2020-11-29 15:16:17 +08:00 |
|