jason
|
91c0c423c0
|
修改 code review
|
2021-11-12 20:37:27 +08:00 |
|
YunaiV
|
e969dbe8b7
|
工作流的 code review
|
2021-11-10 09:11:29 +08:00 |
|
yunlong.li
|
0ff7f2ef74
|
fix: 代码 review 修改
|
2021-11-08 11:19:10 +08:00 |
|
jason
|
fef0562523
|
修改code review
|
2021-11-07 22:21:55 +08:00 |
|
YunaiV
|
1bc4bdac0c
|
工作流的 code review
|
2021-11-07 20:25:31 +08:00 |
|
jason
|
b784bf3e12
|
修改请假流程
|
2021-11-07 17:38:00 +08:00 |
|
jason
|
f0b7583404
|
包名从activiti 改成 bpm
|
2021-11-06 10:22:45 +08:00 |
|
Roland
|
e9e73c402b
|
#返显高亮工作流
|
2021-11-05 20:54:26 +08:00 |
|
yunlong.li
|
9bbeb93b2e
|
fix:[工作流] 返回对应实例的流程图
|
2021-11-05 18:14:56 +08:00 |
|
yunlong.li
|
3c3f46ee4e
|
fix:[工作流] 返回对应实例的流程图
|
2021-11-05 17:13:55 +08:00 |
|
YunaiV
|
abf2f697fb
|
修改 wl =》bpm
|
2021-11-05 07:50:14 +08:00 |
|
YunaiV
|
6f8e8acae0
|
Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/activiti
|
2021-11-05 07:47:19 +08:00 |
|
樊宇
|
b369b363b6
|
动态表单 命名规范
|
2021-11-04 17:35:01 +08:00 |
|
YunaiV
|
b7a90c2c12
|
code review 动态表单
|
2021-11-04 09:03:05 +08:00 |
|
樊宇
|
08d72fe9ca
|
Merge remote-tracking branch 'origin/master' into master
|
2021-11-04 08:56:13 +08:00 |
|
樊宇
|
9d8cdb2670
|
动态表单 后端代码
|
2021-11-03 10:26:01 +08:00 |
|
jason
|
56864db484
|
修改 文件重命名问题
|
2021-11-02 20:47:26 +08:00 |
|
yex
|
4cfa959d98
|
fix: 修复通知和字典查询权限bug
|
2021-11-02 12:25:41 +08:00 |
|
YunaiV
|
c186d279ba
|
code review 工作流的相关代码
|
2021-11-02 07:56:05 +08:00 |
|
芋道源码
|
a4948d27d2
|
update yudao-admin-server/src/main/resources/application-local.yaml.
|
2021-11-01 02:04:26 +00:00 |
|
jason
|
cc56a66332
|
修改code review
|
2021-10-31 22:27:35 +08:00 |
|
jason
|
1b835e058f
|
修改code review
|
2021-10-31 22:26:35 +08:00 |
|
jason
|
0d2ae6be56
|
修改code review
|
2021-10-31 22:13:51 +08:00 |
|
jason
|
f26c17cff0
|
修改code review
|
2021-10-31 22:11:55 +08:00 |
|
YunaiV
|
722eaf3513
|
调整下工作流的包名
|
2021-10-31 09:55:12 +08:00 |
|
YunaiV
|
742125ed99
|
code review 工作流的代码
合并最新的 SQL
|
2021-10-30 13:46:39 +08:00 |
|
YunaiV
|
31c4a52858
|
Merge branch 'feature/activiti' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/activiti
|
2021-10-30 11:07:13 +08:00 |
|
YunaiV
|
0050b1e46d
|
Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/activiti
Conflicts:
yudao-dependencies/pom.xml
yudao-framework/pom.xml
|
2021-10-30 10:24:58 +08:00 |
|
YunaiV
|
8dbd6143bf
|
增加微信小程序的登陆的测试代码
|
2021-10-30 10:09:31 +08:00 |
|
YunaiV
|
c3aa2acddf
|
Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/user-social
Conflicts:
yudao-admin-server/pom.xml
yudao-dependencies/pom.xml
yudao-user-server/src/main/resources/application-dev.yaml
yudao-user-server/src/main/resources/application-local.yaml
|
2021-10-30 09:30:18 +08:00 |
|
YunaiV
|
55e5ca4644
|
code review 用户前台的社交登陆
|
2021-10-28 08:46:51 +08:00 |
|
YunaiV
|
30ad7c43b8
|
Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/user-social
Conflicts:
yudao-core-service/src/main/java/cn/iocoder/yudao/coreservice/modules/system/enums/SysErrorCodeConstants.java
|
2021-10-28 08:30:24 +08:00 |
|
jason
|
d16185f87d
|
修改表单为外置表单
|
2021-10-28 00:51:57 +08:00 |
|
YunaiV
|
7da46d1cfb
|
Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into pay_extension
|
2021-10-28 00:03:42 +08:00 |
|
YunaiV
|
93351e1716
|
1. 修复 File 单元测试报错
2. 修复 mvn package 报错问题
|
2021-10-28 00:01:21 +08:00 |
|
YunaiV
|
2df46a7c2d
|
Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into pay_extension
Conflicts:
更新日志.md
|
2021-10-27 12:32:57 +08:00 |
|
YunaiV
|
65843d55a0
|
修改版本号为 1.2.0-snapshot
|
2021-10-27 10:17:42 +08:00 |
|
YunaiV
|
dd2d8a2ba9
|
优化支付通知的逻辑，解决并发的问题。
同时，收到支付结果时，立马回调业务，避免延迟
|
2021-10-27 10:06:49 +08:00 |
|
timfruit
|
fcf1c228c5
|
初步完成微信公众号登录
|
2021-10-26 21:35:06 +08:00 |
|
YunaiV
|
4acada62d3
|
完成支付回调的逻辑
|
2021-10-26 09:50:18 +08:00 |
|
宋天
|
f4a5a139b5
|
[update]user server模块新增测试，修改部分接口规范问题
|
2021-10-24 22:33:32 +08:00 |
|
YunaiV
|
ab19228ca6
|
完成支付的下单和提交订单的逻辑
|
2021-10-23 20:14:13 +08:00 |
|
jason
|
436781507e
|
merge master change
|
2021-10-23 19:16:00 +08:00 |
|
YunaiV
|
6dc65234ef
|
增加支付相关表的 SQL，调整相关的实体
|
2021-10-23 17:47:27 +08:00 |
|
宋天
|
79da36ac04
|
[update]更新代码规范
|
2021-10-20 16:59:47 +08:00 |
|
宋天
|
c06d6e53f6
|
[update] 新增修改昵称，修改头像，查询昵称与头像接口
|
2021-10-19 22:16:42 +08:00 |
|
YunaiV
|
7ca756a234
|
引入支付宝的支付功能
|
2021-10-19 09:26:49 +08:00 |
|
YunaiV
|
81126b2b4b
|
1. 引入 IJPay 组件
2. 增加创建支付单的 Service 实现
|
2021-10-18 09:41:38 +08:00 |
|
YunaiV
|
711a074059
|
支付系统的实体的初始化
|
2021-10-14 09:05:09 +08:00 |
|
jason
|
ee8dcd0888
|
1.实现了工作流引擎 中 请假流程demo（定义在 resources/leave.bpmn)
2.增加一个一级菜单 OA 办公 下面两个菜单： 请假申请，待办任务
3.暂时不知如何找部门领导， 暂时写死为 admin
4.activity 用户组使用 用户岗位来代替。
5.新增一个用户 hradmin， 密码 123456 岗位是 人力资源
6.演示流程。
a. admin 登陆 申请请假
b. admin 待办任务（审批）
c. hradmin 登陆 待办任务（审批）
d. admin 登陆 待办任务 （确认)
|
2021-10-13 23:43:03 +08:00 |
|