897 Commits (a4383533083d031ce305e10e3ca6ac0d193d2ddd)

Author SHA1 Message Date
YunaiV 888c1371c6 Merge remote-tracking branch 'origin/master' 3 years ago
YunaiV c6031ba2b2 增加 user detail 的 todo 3 years ago
youkehai 0fba0d9a6a feat: 对齐后端-工作流委派的参数 3 years ago
youkehai 2aeba127b6 Merge remote-tracking branch 'upstream/master' into feature/bpm-delegate
# Conflicts:
#	src/views/bpm/processInstance/detail/index.vue
3 years ago
YunaiV 245147223f code review:驳回逻辑 3 years ago
芋道源码 ada93a160b
!251 【工作流】回退fix
Merge pull request !251 from Youkehai/master
3 years ago
kehaiyou f40d1de62a fix: 【工作流】--回退的高亮和api地址更换 3 years ago
kehaiyou 20fe343646 feat: 【工作流】--委派 3 years ago
芋道源码 0ffd07447b
!248 【工作流】流程实例的任务节点回退
Merge pull request !248 from Youkehai/master
3 years ago
YunaiV ce78336fca Merge remote-tracking branch 'origin/dev' into dev 3 years ago
YunaiV 539f8a5bb5 修复 member 详情无法展示的问题 3 years ago
YunaiV e489627748 Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 into dev
# Conflicts:
#	src/views/mall/trade/order/index.vue
#	src/views/member/user/detail/index.vue
3 years ago
kehaiyou de79e79d91 feat: 支持回退按钮 3 years ago
owen 21c67b1b75 Trade: 完善配置 3 years ago
xingyu 2a58e3f691 style: unocss eslint 3 years ago
芋道源码 df6a384321
!244 trade: 分销业务review代码修改
Merge pull request !244 from 疯狂的世界/brokerage
3 years ago
owen 854acf6e70 trade: 分销业务 - 佣金提现后台管理 3 years ago
owen 18b6c70d1a trade: 分销业务review代码修改 3 years ago
绮梦 245301452c 订单详情页面 请求详情接口改为真实携带的id 3 years ago
YunaiV 1be57ea8d3 增加 404 的说明 3 years ago
xingyu a6b4908f45
!232 update src/components/Dialog/src/Dialog.vue.
Merge pull request !232 from AKING/N/A
3 years ago
芋道源码 de615c2387
!241 完善分销功能
Merge pull request !241 from 疯狂的世界/brokerage
3 years ago
YunaiV 8b65a2866e code review:订单相关的逻辑 3 years ago
xingyu 5494756a66 fix: eslint 3 years ago
xingyu 56a71f64e7 fix: #I7WY9N 3 years ago
xingyu 9a6d29b295 fix: avatar 3 years ago
owen 2e830d14d5 trade: 分销业务review代码修改 3 years ago
owen 0582d41972 trade: 分销业务后台功能:推广订单列表 3 years ago
owen 2aa372d8f4 trade: 分销业务后台功能:推广用户列表 3 years ago
puhui999 5dc0c6e3da spu:分佣属性和分佣保持一致 3 years ago
puhui999 615763d415 order:完善订单聚合搜索 3 years ago
puhui999 7e511d1e4f mall-order:修复 todo 提到的问题 3 years ago
owen 87ca916e69 trade: 分销业务后台功能:佣金格式化 3 years ago
owen 5ed909263a trade: 分销业务后台功能:修改上级推广人 3 years ago
owen 7ea3571356 trade: 分销业务后台功能:清除推广员、修改推广资格 3 years ago
puhui999 a79f1452b3 登录界面:姐姐点击登录后界面疯狂闪动的问题 3 years ago
YunaiV 0e2ea39591 code review:会员详情 3 years ago
YunaiV 30f0c1b351 Merge branch 'dev' of https://gitee.com/ls0/yudao-ui-admin-vue3 into dev
 Conflicts:
	src/utils/dict.ts
3 years ago
芋道源码 e3b9a15c26
!239 分销员表格佣金字段格式化
Merge pull request !239 from 疯狂的世界/brokerage
3 years ago
YunaiV 3c315cf287 code review:完善订单详情和售后退款 TODO 提到的问题 3 years ago
芋道源码 dbfabcbbb5
!238 完善订单详情和售后退款 TODO 提到的问题
Merge pull request !238 from puhui999/dev-to-dev
3 years ago
owen dbb87e3850 trade: 分销员表格佣金字段格式化 3 years ago
owen e9d5027e72 trade: 优化分销用户佣金字段名称 3 years ago
owen 7263315412 trade: 优化分销用户绑定用户编号、绑定时间字段名称 3 years ago
owen 34ce7f7ec5 trade: 分销用户管理 3 years ago
puhui999 b3639977a7 完善订单详情 3 years ago
puhui999 f44688d61c Merge remote-tracking branch 'yudao/dev' into dev-to-dev 3 years ago
puhui999 73628d3930 完善订单详情和售后退款 TODO 提到的问题 3 years ago
owen 1e2120806d trade: 分销业务从 member 模块 转移到 trade模块 3 years ago
owen 2ed5d12be8 trade: 分销业务从 member 模块 转移到 trade模块 3 years ago