abu/wzj-boot
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
790 Commits 4 Branches 22 Tags
Commit Graph

359 Commits

Author SHA1 Message Date
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
czx
f006cb9fba 修复更新用餐时间配置页面bug 2020-12-31 14:55:13 +08:00
ryoeiken
6cb636ca40 修改参数 2020-12-31 14:14:30 +08:00
ryoeiken
d3ac78138a 饭堂参数前端页面 2020-12-30 17:52:10 +08:00
ryoeiken
339ea49928 护工添加手机号码及密码 2020-12-30 10:26:25 +08:00
ryoeiken
9e3f618ce2 补贴详情 2020-12-29 17:46:45 +08:00
ryoeiken
af23213b9c 修复窗口收费前端 bug 2020-12-29 16:26:59 +08:00
ryoeiken
418c8b6657 窗口收费 2020-12-29 16:18:20 +08:00
ryoeiken
af71ca6da4 todo：收费 2020-12-28 16:47:51 +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
RuoYi
ba068eae65 修正侧边栏静态路由丢失问题 2020-12-24 19:32:18 +08:00
ryoeiken
f84ce6e13f 病人同步 2020-12-24 17:07:37 +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
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
ef75dedb13 补贴流水列表回显，修复搜索框显示选择字典 2020-12-22 09:24:11 +08:00
ryoeiken
cd24108d93 修改补贴发放提示 2020-12-22 08:40:16 +08:00
DokiYoloo
3c4b01ab83 权限工具类增加admin判断 2020-12-21 19:43:57 +08:00
ryoeiken
f1040fcf40 修复错误 2020-12-21 17:43:03 +08:00
ryoeiken
85747dc9a1 修复前端补贴发放标志不能修改错误 并 根据发放标志插入记录，显示在职员工， 2020-12-21 17:41:53 +08:00
ryoeiken
742ce42f5e 发放日期判断 2020-12-21 17:08:11 +08:00
ryoeiken
aa4289245f 补贴发放 2020-12-21 16:59:16 +08:00
ryoeiken
68778311e8 修复订单管理页面 2020-12-21 13:51:52 +08:00
wugh
886ce995af [bug修复] 解决get请求,如果参数值为false或0等特殊值会导致无法正确传参 2020-12-21 11:58:15 +08:00
疯狂的狮子li
78ef398257 Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue 
 Conflicts:
	ruoyi-admin/src/main/resources/application.yml
	ruoyi-ui/src/store/modules/permission.js
 2020-12-21 11:55:32 +08:00
RuoYi
52264b6e2a 优化多级菜单之间切换无法缓存的问题 2020-12-21 10:50:48 +08:00
疯狂的狮子li
6c8497f632 Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue 
 Conflicts:
	ruoyi-ui/package.json
	ruoyi-ui/src/components/Breadcrumb/index.vue
	ruoyi-ui/src/layout/components/AppMain.vue
	ruoyi-ui/src/layout/components/Sidebar/index.vue
	ruoyi-ui/src/layout/components/TagsView/index.vue
	ruoyi-ui/src/store/getters.js
	ruoyi-ui/src/store/modules/permission.js
	ruoyi-ui/src/views/system/user/profile/resetPwd.vue
	ruoyi-ui/src/views/system/user/profile/userInfo.vue
	ruoyi-ui/src/views/tool/gen/editTable.vue
 2020-12-18 09:45:54 +08:00
RuoYi
c86dc20743 移除path-to-regexp正则匹配插件 2020-12-17 12:05:29 +08:00
ryoeiken
bb88724e20 饭堂系统信息 CRUD 2020-12-17 09:21:46 +08:00
RuoYi
ecc7a8be46 优化多级菜单之间切换无法缓存的问题 2020-12-16 20:57:48 +08:00
疯狂的狮子li
1249c7ca26 Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue 
 Conflicts:
	ruoyi-ui/src/permission.js
	ruoyi-ui/src/views/login.vue
 2020-12-15 10:25:00 +08:00
RuoYi
4f33da2a3f 登录后push添加catch防止出现检查错误 2020-12-15 10:04:09 +08:00
czx
21a2fcfed6 新增获取当天员工订单接口 2020-12-14 17:40:34 +08:00
czx
16e2baae11 Merge remote-tracking branch 'origin/master' into master 
# Conflicts:
#	ruoyi-admin/src/main/resources/application.yml
#	ruoyi-ui/package.json
#	ruoyi-ui/src/views/index.vue
 2020-12-14 17:26:45 +08:00
疯狂的狮子li
7e476b941e Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue 
 Conflicts:
	ruoyi-admin/src/main/resources/application.yml
	ruoyi-common/src/main/java/com/ruoyi/common/core/redis/RedisCache.java
	ruoyi-ui/package.json
	ruoyi-ui/src/main.js
	ruoyi-ui/src/views/index.vue
	ruoyi-ui/src/views/tool/gen/index.vue
 2020-12-14 09:27:27 +08:00
RuoYi
8988d0b4ab 若依 3.3.0 2020-12-14 09:02:10 +08:00
RuoYi
ceefa20aa2 调整代码生成页列宽 2020-12-13 16:05:49 +08:00
RuoYi
ecfe7006e2 代码生成预览支持高亮显示 2020-12-11 17:04:54 +08:00
疯狂的狮子li
f56f57a236 Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue 
 Conflicts:
	ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictDataController.java
	ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java
	ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/LogAspect.java
	ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysRoleMenuMapper.java
	ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysRoleServiceImpl.java
	ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
	ruoyi-system/src/main/resources/mapper/system/SysRoleMenuMapper.xml
	ruoyi-ui/package.json
	ruoyi-ui/src/assets/styles/ruoyi.scss
	ruoyi-ui/src/assets/styles/sidebar.scss
	ruoyi-ui/src/assets/styles/variables.scss
	ruoyi-ui/src/components/HeaderSearch/index.vue
	ruoyi-ui/src/components/Screenfull/index.vue
	ruoyi-ui/src/layout/components/Settings/index.vue
	ruoyi-ui/src/layout/components/Sidebar/Logo.vue
	ruoyi-ui/src/layout/components/Sidebar/SidebarItem.vue
	ruoyi-ui/src/layout/components/Sidebar/index.vue
	ruoyi-ui/src/layout/components/TagsView/ScrollPane.vue
	ruoyi-ui/src/layout/index.vue
	ruoyi-ui/src/main.js
	ruoyi-ui/src/settings.js
	ruoyi-ui/src/store/modules/settings.js
	ruoyi-ui/src/store/modules/user.js
	ruoyi-ui/src/views/login.vue
	ruoyi-ui/src/views/system/user/index.vue
	ruoyi-ui/src/views/system/user/profile/resetPwd.vue
	ruoyi-ui/src/views/system/user/profile/userInfo.vue
	ruoyi-ui/src/views/tool/gen/editTable.vue
	ruoyi-ui/src/views/tool/gen/index.vue
	ruoyi-ui/vue.config.js
 2020-12-11 14:27:54 +08:00
RuoYi
9e387dc447 去除用户手机邮箱部门必填验证 2020-12-11 13:26:14 +08:00
RuoYi
d6eac2dc8d 前端更新插件版本 2020-12-11 09:27:12 +08:00
RuoYi
b368ad764f 升级core-js到最新版本3.8.1 2020-12-10 12:08:18 +08:00
RuoYi
ffd5f0ce5d 升级vue-router到最新版本3.4.9 2020-12-10 11:14:44 +08:00
RuoYi
a50beae599 代码生成预览提供滚动机制 2020-12-10 11:13:39 +08:00
ryoeiken
6d4d7ef8f1 Merge remote-tracking branch 'origin/master' into master 2020-12-09 17:34:36 +08:00
ryoeiken
56aa0ed630 完善 日常收费-收费功能 2020-12-09 17:34:21 +08:00