dhb52
|
c2038b95bf
|
Merge remote-tracking branch 'yudao/master'
|
2023-11-23 08:47:06 +08:00 |
|
liuhongfeng
|
aceac6daae
|
【修改】ureport2 集成
|
2023-11-22 22:09:48 +08:00 |
|
owen
|
253401ace3
|
营销：适配商城装修组件【优惠券】
|
2023-11-22 16:58:00 +08:00 |
|
puhui999
|
12b59200c1
|
crm-客户：集成团队成员
|
2023-11-22 15:45:10 +08:00 |
|
puhui999
|
19a0a83054
|
crm-数据权限：完善团队成员公共组件
|
2023-11-22 15:44:42 +08:00 |
|
YunaiV
|
f74ddf46ae
|
sms：移除 sendCode、sendMsg 字段
|
2023-11-21 22:53:49 +08:00 |
|
owen
|
1bb9df7b3c
|
商品中心：修复商品表格选择对话框，在多选时表头内的多选框不显示选中效果的问题
|
2023-11-21 10:27:29 +08:00 |
|
liuhongfeng
|
4440ec866c
|
【新增】ureport2 集成
|
2023-11-20 23:32:54 +08:00 |
|
owen
|
e0a731dd86
|
商品评论、优惠券模板复用组件【商品橱窗】
|
2023-11-20 10:53:02 +08:00 |
|
owen
|
3198688eb5
|
营销：适配商城装修组件【商品栏】
|
2023-11-19 18:27:25 +08:00 |
|
芋道源码
|
b0b669129b
|
!314 会员中心商品收藏
Merge pull request !314 from niou233/featrue/mall_org
|
2023-11-18 16:32:02 +00:00 |
|
芋道源码
|
4423e9b804
|
!326 CRM 客户最新的代码
Merge pull request !326 from 芋道源码/dev
|
2023-11-18 16:30:42 +00:00 |
|
YunaiV
|
ebb19cfe8c
|
Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 into dev
|
2023-11-19 00:30:02 +08:00 |
|
YunaiV
|
b1f5ad55b8
|
crm：code review 权限列表
|
2023-11-19 00:28:22 +08:00 |
|
芋道源码
|
2e01944df9
|
!322 crm-团队成员：完善团队成员通用组件封装
Merge pull request !322 from puhui999/dev-to-dev
|
2023-11-18 16:13:06 +00:00 |
|
芋道源码
|
5f0b0bd21d
|
!324 商城装修
Merge pull request !324 from 疯狂的世界/dev
|
2023-11-18 14:18:12 +00:00 |
|
芋道源码
|
9d7c578d48
|
!323 update src/views/Profile/components/UserSocial.vue.
Merge pull request !323 from 口口口/N/A
|
2023-11-18 14:17:55 +00:00 |
|
YunaiV
|
526172af60
|
crm：code review 客户配置管理
|
2023-11-18 22:11:42 +08:00 |
|
芋道源码
|
c06223decd
|
!316 feat: CRM 客户公海配置 + CRM 客户限制 + review 修改
Merge pull request !316 from wanwan/dev
|
2023-11-18 13:45:48 +00:00 |
|
芋道源码
|
f07d37438d
|
!321 修复滑块验证码无任何滑动直接点击验证时，x坐标空，导致后端NPE的问题
Merge pull request !321 from 柯杨/master
|
2023-11-18 13:43:22 +00:00 |
|
YunaiV
|
85e953b920
|
crm：code review 联系人管理
|
2023-11-18 21:08:00 +08:00 |
|
YunaiV
|
7c5ae17d04
|
Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 into dev
# Conflicts:
# src/components/DiyEditor/components/ComponentContainer.vue
|
2023-11-18 20:39:31 +08:00 |
|
芋道源码
|
538783ce2d
|
!317 crm联系人前端
Merge pull request !317 from zyna/master
|
2023-11-18 12:35:34 +00:00 |
|
YunaiV
|
f1e3eccc8a
|
Merge branch 'feature/sub-table' of https://gitee.com/yudaocode/yudao-ui-admin-vue3
|
2023-11-18 18:00:41 +08:00 |
|
YunaiV
|
652698b871
|
代码生成：增加说明文档
|
2023-11-18 18:00:19 +08:00 |
|
芋道源码
|
26dba8b457
|
!325 新增主子表、树表的代码生成
Merge pull request !325 from 芋道源码/feature/sub-table
|
2023-11-18 09:57:33 +00:00 |
|
owen
|
f5d611968f
|
Merge remote-tracking branch 'origin/dev' into dev
|
2023-11-17 21:51:42 +08:00 |
|
YunaiV
|
a42d0695fe
|
代码生成：增加主子表 erp 模式的示例
|
2023-11-17 13:21:17 +08:00 |
|
口口口
|
68f6683e52
|
update src/views/Profile/components/UserSocial.vue.
在这里绑定，绑定成功后，列表重复
Signed-off-by: 口口口 <17975121@qq.com>
|
2023-11-17 05:17:17 +00:00 |
|
owen
|
b4a1772584
|
营销：适配商城装修组件【商品卡片】
|
2023-11-17 10:14:26 +08:00 |
|
YunaiV
|
6c405ba420
|
代码生成：增加主子表 inner 模式的示例
|
2023-11-16 23:48:20 +08:00 |
|
YunaiV
|
9aca49c1ff
|
代码生成：增加主子表 normal 模式的示例
|
2023-11-16 23:24:03 +08:00 |
|
YunaiV
|
bbc37613b6
|
代码生成：增加 tree 树形的示例
|
2023-11-16 20:39:12 +08:00 |
|
YunaiV
|
3d0c4f4422
|
代码生成：支持树形表结构的配置
|
2023-11-16 00:11:23 +08:00 |
|
YunaiV
|
40b1522ed0
|
代码生成：增加 crud 单表示例
|
2023-11-15 23:48:00 +08:00 |
|
Wanwan
|
22206b25e1
|
feat: CRM 客户限制
|
2023-11-15 21:55:44 +08:00 |
|
xingyu
|
821c804189
|
fix: stylelint
|
2023-11-14 21:56:54 +08:00 |
|
xingyu
|
249e0d21a3
|
fix: eslint
|
2023-11-14 21:56:02 +08:00 |
|
xingyu
|
8a74b954d0
|
docs: update deps
|
2023-11-14 21:53:30 +08:00 |
|
xingyu
|
e56afbf80f
|
chore: update deps
|
2023-11-14 21:49:49 +08:00 |
|
puhui999
|
8e0cf5c1e5
|
crm-团队成员：新增获得权限级别名称函数 getLevelName
|
2023-11-14 12:06:42 +08:00 |
|
puhui999
|
ba702d03bc
|
Merge remote-tracking branch 'yudao/dev' into dev-to-dev
|
2023-11-14 11:26:41 +08:00 |
|
puhui999
|
015a1640c1
|
crm-团队成员：完善团队成员通用组件封装
|
2023-11-14 11:26:07 +08:00 |
|
YunaiV
|
45656562a8
|
代码生成：支持设置主子表的信息
|
2023-11-14 09:50:54 +08:00 |
|
柯杨
|
8bb9dec328
|
【bugfix】：修复滑块验证码无任何滑动直接点击验证时，x坐标空，导致后端NPE的问题
Signed-off-by: 柯杨 <key5230@163.com>
|
2023-11-14 01:43:59 +00:00 |
|
芋道源码
|
c1a92ba22a
|
!319 商城装修
Merge pull request !319 from 疯狂的世界/dev
|
2023-11-14 00:31:55 +00:00 |
|
puhui999
|
27c9a0f32d
|
crm-团队成员： 先提交一波
|
2023-11-13 17:49:27 +08:00 |
|
puhui999
|
2385cd9b9a
|
fix：如果已经到重新登录页面则不进行弹窗提示
|
2023-11-13 15:48:21 +08:00 |
|
YunaiV
|
999d8de9e9
|
代码生成：增加主子表（内嵌）的示例
|
2023-11-13 13:57:15 +08:00 |
|
YunaiV
|
f0f7886025
|
代码生成：增加主子表（普通）的示例
|
2023-11-12 22:33:38 +08:00 |
|