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 |
|
RuoYi
|
a69cc94f35
|
三级菜单自动配置组件
|
2020-11-28 20:39:03 +08:00 |
|
RuoYi
|
c666faed66
|
修复三级菜单之间切换页面无法缓存的问题
|
2020-11-28 20:31:45 +08:00 |
|
28353131@qq.com
|
5b598909f7
|
删除无用的console
|
2020-11-28 19:03:16 +08:00 |
|
28353131@qq.com
|
ba32570859
|
增加价格自动计算和格式化回显
|
2020-11-28 19:02:18 +08:00 |
|
28353131@qq.com
|
d1a5c75da8
|
优化显示效果，增大菜单栏的长度
|
2020-11-28 18:33:24 +08:00 |
|
28353131@qq.com
|
16a6560ff4
|
优化多选状态下菜品显示，同时显示价格
|
2020-11-28 18:20:43 +08:00 |
|
28353131@qq.com
|
b3a0332835
|
优化交互功能，嵌入多选器显示菜单，并可以直接编辑保存
|
2020-11-28 18:06:38 +08:00 |
|
RuoYi
|
6072239a40
|
修改缓存监控内存单位
|
2020-11-28 13:57:19 +08:00 |
|
28353131@qq.com
|
e3c0bc3c5c
|
1、完善每周菜谱功能，用户不能添加和删除
2、列表中增加合并列显示效果
3、增加菜品列表
|
2020-11-28 12:53:37 +08:00 |
|
RuoYi
|
a3b86d6f6d
|
代码生成删除多余的数字float类型
|
2020-11-28 12:09:24 +08:00 |
|
RuoYi
|
fd831d5a90
|
Excel支持导入Boolean型数据
|
2020-11-28 12:08:55 +08:00 |
|
28353131@qq.com
|
bac94b2f03
|
修改每周菜谱数据类型，对应修改实体类
|
2020-11-28 11:16:34 +08:00 |
|
czx
|
797a9c3cd8
|
Merge remote-tracking branch 'origin/master' into master
|
2020-11-27 17:48:10 +08:00 |
|
czx
|
6864c23124
|
增加填写同步日志功能
|
2020-11-27 17:47:34 +08:00 |
|
ryoeiken
|
737186308d
|
Merge remote-tracking branch 'origin/master' into master
|
2020-11-27 17:28:32 +08:00 |
|
ryoeiken
|
c696a03232
|
添加每周食谱
|
2020-11-27 17:28:17 +08:00 |
|
czx
|
0ef4ec268e
|
增加填充新病患的报餐默认配置数据
|
2020-11-27 17:13:41 +08:00 |
|
ryoeiken
|
7ab0d24e50
|
添加病人报餐
|
2020-11-26 16:32:01 +08:00 |
|
ryoeiken
|
000f94049b
|
添加默认报餐表总价格
|
2020-11-26 15:45:18 +08:00 |
|
ryoeiken
|
02229ed732
|
默认报餐表显示
|
2020-11-26 15:00:44 +08:00 |
|
czx
|
820bb00831
|
完善远程病患同步逻辑
|
2020-11-26 14:29:20 +08:00 |
|
czx
|
63d72d7f51
|
完成同步远程病患数据到本地
|
2020-11-26 11:29:02 +08:00 |
|
czx
|
a2798f7a1f
|
不同数据源切换同步远程病患到本地
|
2020-11-26 09:33:32 +08:00 |
|
ryoeiken
|
c91b0f55e5
|
默认报餐
|
2020-11-26 00:40:17 +08:00 |
|