YunaiV
|
a42c1cbe4e
|
pay：前端收银台接入支付宝扫码
|
3 years ago |
|
YunaiV
|
7eb084b784
|
pay：前端收银台的信息接入
|
3 years ago |
shizhong
|
72ed932e14
|
Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
|
3 years ago |
|
YunaiV
|
668d8ec02c
|
增加支付收银台的前端界面
|
3 years ago |
|
YunaiV
|
f734d7ddad
|
增加接入示例的查询
|
3 years ago |
|
芋道源码
|
83573b3d58
|
!408 菜单新增 alwaysShow 总是展示、componentName 组件名
Merge pull request !408 from 芋道源码/feature/dev-yunai
|
3 years ago |
|
YunaiV
|
534c155ee2
|
菜单新增 alwaysShow 总是展示、componentName 组件名
|
3 years ago |
|
shizhong
|
cf892f7185
|
Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
|
3 years ago |
xingyuv
|
2f285c2d66
|
feat: update deps
|
3 years ago |
|
芋道源码
|
c4ebff0b1f
|
!403 集成 Go-View 大屏设计器
Merge pull request !403 from 芋道源码/feature/dev-yunai
|
3 years ago |
|
YunaiV
|
70a900865d
|
集成 Go-View 大屏设计器
|
3 years ago |
|
YunaiV
|
37e302f189
|
集成 Go-View 大屏设计器
|
3 years ago |
|
shizhong
|
9dba0ac845
|
Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
|
3 years ago |
|
芋道源码
|
cb51da0734
|
!397 Vue3 工作流的预览版
Merge pull request !397 from 芋道源码/feature/vue3-bpm
|
3 years ago |
|
YunaiV
|
741ba0b0ad
|
Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/vue3-bpm
# Conflicts:
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/BpmOALeaveBaseVO.java
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/vo/task/BpmTaskTodoPageReqVO.java
|
3 years ago |
|
芋道源码
|
1851d58d62
|
!396 增加商城的提示
Merge pull request !396 from 芋道源码/feature/dev-yunai
|
3 years ago |
|
YunaiV
|
9c8bd17e56
|
增加商城的提示
|
3 years ago |
|
芋道源码
|
69275cca82
|
!380 springdoc
Merge pull request !380 from xingyu/feature/springdoc
|
3 years ago |
|
YunaiV
|
b70660a3c6
|
Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/springdoc
# Conflicts:
# yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/config/ConfigController.java
# yudao-module-mall/yudao-module-product-biz/src/test/resources/sql/clean.sql
# yudao-module-mall/yudao-module-product-biz/src/test/resources/sql/create_tables.sql
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/auth/AuthController.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dept/DeptController.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dept/PostController.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/permission/RoleController.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/sms/SmsChannelController.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/UserController.java
# yudao-server/pom.xml
|
3 years ago |
|
芋道源码
|
f84898a2a5
|
!369 解决只有一个菜单时无法显示目录
Merge pull request !369 from zhang.xionghui/master
|
3 years ago |
|
shizhong
|
c346a6e730
|
Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
Conflicts:
yudao-ui-admin/yarn.lock
|
3 years ago |
|
芋道源码
|
31e0916cb2
|
!388 修复 mp 模块路径重复 && 升级 springboot 2.7.8
Merge pull request !388 from xingyu/1.X-dev
|
3 years ago |
|
xingyu
|
932c82111f
|
fix: slot-scope 已过期 ==》 v-slot
|
3 years ago |
|
xingyu
|
37b762405d
|
mp user => mp mpuser
|
3 years ago |
|
xingyu
|
2bf4431044
|
fix: mp menu error
|
3 years ago |
|
YunaiV
|
5ef8668c7b
|
Merge branch 'feature/vue3-bpm' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/vue3-bpm
|
3 years ago |
|
xingyu
|
76f1d2fa9c
|
Merge remote-tracking branch 'origin/master' into feature/springdoc
# Conflicts:
# README.md
|
3 years ago |
|
YunaiV
|
d5c67800b7
|
Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/vue3-bpm
|
3 years ago |
|
YunaiV
|
d48a14e799
|
版本 1.7.0 发布：增加微信公众号、站内信、邮箱、数据脱敏！
|
3 years ago |
|
芋道源码
|
c3a014d514
|
!387 新增站内信
Merge pull request !387 from 芋道源码/feature/notify
|
3 years ago |
|
xingyu
|
96111ab714
|
feat: swagger-ui
|
3 years ago |
|
YunaiV
|
882d5596e2
|
站内信模块：vue3 站内信弹板
|
3 years ago |
|
YunaiV
|
221a3386b5
|
站内信模块：完善注释
|
3 years ago |
|
YunaiV
|
dbba4d8058
|
站内信模块：整体功能实现
|
3 years ago |
gexinzhineng/gxzn27
|
33ecb638ed
|
修改数据弹出层
|
3 years ago |
|
YunaiV
|
2d3046e05a
|
Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/notify
# Conflicts:
# sql/mysql/ruoyi-vue-pro.sql
# yudao-ui-admin/src/utils/dict.js
|
3 years ago |
|
芋道源码
|
473de10143
|
!385 增加邮件功能
Merge pull request !385 from 芋道源码/feature/mail-1.6.1
|
3 years ago |
|
YunaiV
|
0480643a9c
|
邮箱模块：vue3 邮件模版的管理
|
3 years ago |
|
YunaiV
|
1932ef7521
|
邮箱模块：vue3 邮箱账号的管理
|
3 years ago |
|
YunaiV
|
f6e6c317d7
|
邮箱模块：完善前端的界面
|
3 years ago |
|
YunaiV
|
bfa14b7511
|
邮箱模块：完善 template 的单元测试
|
3 years ago |
|
YunaiV
|
a0a45338e9
|
邮箱模块：完善 account 的单元测试
|
3 years ago |
|
YunaiV
|
e542cd765d
|
邮箱模块：完善 log 相关的逻辑
|
3 years ago |
|
YunaiV
|
a53b8f4100
|
邮箱模块：完善 template 模版的增删改查功能
|
3 years ago |
|
YunaiV
|
c806d033f1
|
邮箱模块：完善 account 账号的增删改查功能
|
3 years ago |
|
YunaiV
|
9db8e850dd
|
492919d：升级element-ui到最新版本2.15.12
|
3 years ago |
|
YunaiV
|
fdde538152
|
b4bdd4f：开启TopNav没有子菜单隐藏侧边栏
|
3 years ago |
|
YunaiV
|
18191f9673
|
bpm：流程详情的转派审批人
|
3 years ago |
|
YunaiV
|
cd27918984
|
bpm：流程详情的时间轴
|
3 years ago |
|
YunaiV
|
3c5fb39e9a
|
bpm：完成流程实例的列表界面
|
3 years ago |
