YunaiV
|
bc6cdecb23
|
Merge remote-tracking branch 'origin/feature/sub-table'
|
2023-11-30 20:49:37 +08:00 |
|
芋道源码
|
58b901a8c1
|
!769 fix：修复 vue2 代码生成后 api 导入路径不正确的问题
Merge pull request !769 from puhui999/feature/sub-table
|
2023-11-30 12:48:51 +00:00 |
|
YunaiV
|
db03b10d24
|
crm: 增加基于客户查询商机分页
|
2023-11-30 20:21:39 +08:00 |
|
YunaiV
|
2d9f5cc4d0
|
crm: 1）调整合同的 CRM 前缀；2）增加基于客户查询合同分页
|
2023-11-30 19:12:37 +08:00 |
|
YunaiV
|
fe4b51b9ad
|
crm: 完善数据权限的逻辑
|
2023-11-30 13:42:36 +08:00 |
|
YunaiV
|
53b8e37f36
|
crm: 增加联系人，基于客户的读取接口
|
2023-11-29 22:33:47 +08:00 |
|
puhui999
|
103e38b82c
|
Merge remote-tracking branch 'yudao/feature/sub-table' into feature/sub-table
|
2023-11-29 18:57:31 +08:00 |
|
puhui999
|
25595a13f4
|
fix：修复 vue2 代码生成后 api 导入路径不正确的问题
|
2023-11-29 18:57:09 +08:00 |
|
YunaiV
|
1a93e3a110
|
crm：code review 联系人
|
2023-11-28 21:07:23 +08:00 |
|
芋道源码
|
591bc36737
|
!763 crm联系人review修改
Merge pull request !763 from zyna/feature/crm
|
2023-11-28 13:03:04 +00:00 |
|
YunaiV
|
36a51b68d9
|
crm：code review 数据权限
|
2023-11-28 20:36:57 +08:00 |
|
芋道源码
|
6f882ca24e
|
!762 crm：完善 code review 数据权限提到的问题
Merge pull request !762 from puhui999/feature/crm
|
2023-11-28 12:33:19 +00:00 |
|
芋道源码
|
7724d6e830
|
!765 Vue2 + Element UI 代码生成器
Merge pull request !765 from 芋道源码/feature/sub-table
|
2023-11-28 12:28:30 +00:00 |
|
芋道源码
|
d3a565f011
|
!761 代码生成：vue2 代码模版格式调整；代码生成：准备 CodegenEngineVue2Test 所需测试文件
Merge pull request !761 from puhui999/feature/sub-table
|
2023-11-28 12:26:50 +00:00 |
|
芋道源码
|
b79f6a8859
|
!764 返回使用过优惠券逻辑---->状态字段取错了
Merge pull request !764 from Ai3_刘小龙/N/A
|
2023-11-28 12:25:05 +00:00 |
|
Ai3_刘小龙
|
7b587a79ca
|
返回使用过优惠券逻辑---->状态字段取错了
Signed-off-by: Ai3_刘小龙 <wisty0317@163.com>
|
2023-11-28 09:16:58 +00:00 |
|
puhui999
|
79600774ec
|
crm-客户：分页查询 mapper 还是得拆成两个，怎么查逻辑交给 service 去做处理
|
2023-11-28 14:27:36 +08:00 |
|
zyna
|
1580789334
|
crm联系人review修改
|
2023-11-27 23:42:04 +08:00 |
|
puhui999
|
6c536caad4
|
crm：完善 code review 数据权限提到的问题
|
2023-11-27 21:47:56 +08:00 |
|
puhui999
|
c437201236
|
代码生成：CodegenEngineVue2Test 所需测试文件
|
2023-11-27 21:15:32 +08:00 |
|
puhui999
|
b4d16b368d
|
Merge remote-tracking branch 'yudao/feature/sub-table' into feature/sub-table
|
2023-11-27 21:07:45 +08:00 |
|
puhui999
|
5ebebf1579
|
代码生成：vue2 代码模拟格式调整
|
2023-11-27 21:05:41 +08:00 |
|
YunaiV
|
fd2af50202
|
Merge remote-tracking branch 'origin/feature/crm' into feature/crm
# Conflicts:
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/customer/CrmCustomerService.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/customer/CrmCustomerServiceImpl.java
|
2023-11-27 20:52:44 +08:00 |
|
YunaiV
|
492adfe8e5
|
crm：code review 数据权限
|
2023-11-27 20:51:51 +08:00 |
|
YunaiV
|
455f8e49fb
|
crm：code review 联系人
|
2023-11-27 20:42:35 +08:00 |
|
zyna
|
16084d468d
|
crm联系人删除多余文件
|
2023-11-27 20:42:35 +08:00 |
|
zyna
|
3f3899f5d3
|
crm联系人review修改，新增地区字段
|
2023-11-27 20:42:34 +08:00 |
|
YunaiV
|
d6d4e50c4b
|
crm：code review 联系人
|
2023-11-27 20:28:18 +08:00 |
|
芋道源码
|
4e897f3a9b
|
!755 crm联系人review修改
Merge pull request !755 from zyna/feature/crm
|
2023-11-27 12:06:53 +00:00 |
|
YunaiV
|
df51a678eb
|
code review：vue2 主子表的生成
|
2023-11-27 17:09:53 +08:00 |
|
芋道源码
|
12bcee2a72
|
!734 代码生成：重构 vue2 代码生成模版，使用 async await 优化代码层次，适配树表和主子表
Merge pull request !734 from puhui999/feature/sub-table
|
2023-11-27 08:53:41 +00:00 |
|
puhui999
|
6d228828f4
|
application-local.yaml 恢复
|
2023-11-27 16:34:55 +08:00 |
|
puhui999
|
4f42e7ca68
|
代码生成：Vue2 界面：修正 $refs
|
2023-11-27 16:31:06 +08:00 |
|
puhui999
|
86160f40de
|
代码生成：重构 vue2 代码生成模版，使用 async await 优化代码层次
|
2023-11-27 16:30:30 +08:00 |
|
puhui999
|
4a51b20155
|
crm-客户：修复合并差异
|
2023-11-27 12:14:32 +08:00 |
|
puhui999
|
f87d73724b
|
Merge remote-tracking branch 'yudao/feature/crm' into feature/crm
# Conflicts:
# yudao-module-crm/yudao-module-crm-api/src/main/java/cn/iocoder/yudao/module/crm/enums/ErrorCodeConstants.java
# yudao-module-crm/yudao-module-crm-biz/src/test/java/cn/iocoder/yudao/module/crm/service/business/BusinessStatusTypeServiceImplTest.java
|
2023-11-27 12:12:52 +08:00 |
|
puhui999
|
8f06d02293
|
crm-客户：完善 code review 提到的问题
|
2023-11-27 12:00:53 +08:00 |
|
puhui999
|
7f569f3299
|
crm-数据权限：完善数据权限
|
2023-11-27 10:55:32 +08:00 |
|
zyna
|
930b5a8dd5
|
crm联系人删除多余文件
|
2023-11-26 22:03:06 +08:00 |
|
zyna
|
d2c6c285f7
|
crm联系人review修改，新增地区字段
|
2023-11-26 22:00:14 +08:00 |
|
YunaiV
|
f766474ff4
|
crm：code review 客户配置
|
2023-11-26 19:57:40 +08:00 |
|
芋道源码
|
18c8a11a89
|
!751 feat: 客户配置 review 修改
Merge pull request !751 from wanwan/feature/crm
|
2023-11-26 11:46:53 +00:00 |
|
YunaiV
|
e4378e5628
|
修复 WxPayOrderNotifyV3Result 的重命名
|
2023-11-26 19:24:11 +08:00 |
|
芋道源码
|
b580356051
|
!753 优化对 dameng 工作流的适配
Merge pull request !753 from 芋道源码/feature/bpm-dameng
|
2023-11-26 11:21:19 +00:00 |
|
YunaiV
|
81f1800f40
|
优化对 dameng 工作流的适配
|
2023-11-26 19:19:31 +08:00 |
|
芋道源码
|
d07869f461
|
!723 feat: 达梦flowable 6.8适配
Merge pull request !723 from dhb52/master
|
2023-11-26 10:55:13 +00:00 |
|
YunaiV
|
a1e6348a37
|
移除 weixin starter 组件，直接改成 wxjava starter
|
2023-11-26 17:08:16 +08:00 |
|
芋道源码
|
ee25b8aedb
|
!752 使用 justauth 替代现有 yudao-spring-boot-starter-biz-social 依赖，减少 starter
Merge pull request !752 from 芋道源码/feature/justauth-op
|
2023-11-26 03:42:16 +00:00 |
|
YunaiV
|
0bf24c6d16
|
使用 spring-boot-starter-justauth 替代原本 social starter
|
2023-11-26 11:39:29 +08:00 |
|
Wanwan
|
fbf864b6b4
|
fix: 修复客户公海配置设置为不启用时保存字段没有清空的 bug
|
2023-11-26 02:00:23 +08:00 |
|