YunaiV
|
98697ee075
|
⬆️
|
2 years ago |
YunaiV
|
3707662187
|
📈 CRM:code review 数据权限
|
2 years ago |
YunaiV
|
d430063eec
|
Merge remote-tracking branch 'puhui/feature/crm' into feature/crm
# Conflicts:
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/api/user/AdminUserApiImpl.java
|
2 years ago |
puhui999
|
455a4ebc7b
|
CRM-客户:实现数据权限、场景检索和公海数据分页查询
|
2 years ago |
YunaiV
|
2dd835893a
|
🔧 简化 permission 模块的 VO
|
2 years ago |
YunaiV
|
455f8e49fb
|
crm:code review 联系人
|
2 years ago |
zyna
|
3f3899f5d3
|
crm联系人review修改,新增地区字段
|
2 years ago |
YunaiV
|
6f135303d8
|
sms:移除 SmsCodeMapping + SmsCommonResult,简化短信的封装
|
2 years ago |
YunaiV
|
8c9873c425
|
Merge branch 'feature/crm' of https://gitee.com/puhui999/ruoyi-vue-pro into feature/crm
# Conflicts:
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/customer/CrmCustomerController.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/convert/contact/ContactConvert.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/convert/customer/CrmCustomerConvert.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/contact/ContactServiceImpl.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/customer/CrmCustomerServiceImpl.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/convert/dept/PostConvert.java
|
2 years ago |
YunaiV
|
8c9c91f0ca
|
crm:code review 配置管理
|
2 years ago |
YunaiV
|
f5ea270be3
|
部门:优化父部门的校验逻辑,为代码生成做个铺垫?!
|
2 years ago |
puhui999
|
668fae9398
|
CRM-数据权限:完善 code review 提到的问题
|
2 years ago |
YunaiV
|
feba904fd8
|
多租户:登录界面,根据 host 域名获取对应的租户编号
|
2 years ago |
YunaiV
|
787de1be94
|
Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/mall_product
# Conflicts:
# sql/mysql/mall.sql
# sql/mysql/ruoyi-vue-pro.sql
# yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/controller/app/wallet/vo/recharge/AppPayWalletRechargeCreateReqVO.java
# yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/service/wallet/PayWalletRechargeServiceImpl.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/social/SocialUserService.java
|
2 years ago |
YunaiV
|
87bc3f510c
|
优化:社交登录、用户的管理
|
2 years ago |
puhui999
|
12ae5bf128
|
新增社交用户 RUD
|
2 years ago |
puhui999
|
738fcef453
|
新增社交客户端 CRUD
|
2 years ago |
YunaiV
|
728308cbc0
|
member:优化部分变量的命名
|
2 years ago |
YunaiV
|
979b484d7f
|
saas:支持社交应用的多租户配置(wx 小程序)
|
2 years ago |
YunaiV
|
6f757e5297
|
saas:支持社交应用的多租户配置(mp)
|
2 years ago |
YunaiV
|
d256275099
|
saas:支持社交应用的多租户配置
|
2 years ago |
YunaiV
|
5913ee0706
|
Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/mall_product
# Conflicts:
# yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/jackson/config/YudaoJacksonAutoConfiguration.java
# yudao-module-mall/yudao-module-promotion-api/src/main/java/cn/iocoder/yudao/module/promotion/enums/ErrorCodeConstants.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/bargain/vo/activity/AppBargainActivityDetailRespVO.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/bargain/vo/activity/AppBargainActivityRespVO.java
# yudao-module-mall/yudao-module-trade-api/src/main/java/cn/iocoder/yudao/module/trade/enums/ErrorCodeConstants.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/order/vo/AppTradeOrderSettlementReqVO.java
# yudao-module-member/yudao-module-member-api/src/main/java/cn/iocoder/yudao/module/member/enums/ErrorCodeConstants.java
# yudao-module-pay/yudao-module-pay-api/src/main/java/cn/iocoder/yudao/module/pay/enums/ErrorCodeConstants.java
# yudao-server/src/main/resources/application-local.yaml
|
3 years ago |
owen
|
e9fd377772
|
分销:Review代码修改
|
3 years ago |
owen
|
637ae8ce1d
|
分佣: 提现记录
|
3 years ago |
YunaiV
|
b81ebe6f19
|
修复 common 下的 test 引入不正确的问题,减少包依赖大小
|
3 years ago |
YunaiV
|
8b50cd9661
|
Merge branch 'feature/mall_product' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
Conflicts:
yudao-module-mall/yudao-module-promotion-api/src/main/java/cn/iocoder/yudao/module/promotion/enums/ErrorCodeConstants.java
yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/combination/AppCombinationRecordController.java
yudao-module-mall/yudao-module-trade-api/src/main/java/cn/iocoder/yudao/module/trade/enums/ErrorCodeConstants.java
yudao-module-member/yudao-module-member-api/src/main/java/cn/iocoder/yudao/module/member/enums/ErrorCodeConstants.java
yudao-module-pay/yudao-module-pay-api/src/main/java/cn/iocoder/yudao/module/pay/enums/ErrorCodeConstants.java
|
3 years ago |
YunaiV
|
40e1a879e3
|
登录:社交登录时,额外返回 openid
|
3 years ago |
dhb52
|
d7488e70b0
|
使用下划线分割ErrorCodeConstants的ErrorCode
|
3 years ago |
YunaiV
|
95254341a1
|
1. 会员用户的找回密码 API 的优化
|
3 years ago |
YunaiV
|
5d4a7ffa3b
|
1. 会员用户的修改密码 API 的优化
|
3 years ago |
YunaiV
|
87e5b2bed1
|
1. 会员用户的修改手机 API 的优化
|
3 years ago |
YunaiV
|
5d6308e4bb
|
对齐 boot 与 cloud 的代码
|
3 years ago |
puhui999
|
5bfca56efa
|
fix:完善 TODO 提到的问题
|
3 years ago |
崔家辉
|
fbeaa06100
|
bugfix: 解决不同模块错误码区间冲突、部分错误码重复错误
|
3 years ago |
YunaiV
|
5c0161d762
|
修复租户名的重复问题
|
3 years ago |
shizhong
|
55358aa170
|
租户添加或修改时租户名称改为不可以重复,否则会造成重复名称的租户无法正常登录的问题
|
3 years ago |
YunaiV
|
837345ed95
|
system:将 api 的方法名的负数都换成 List
|
3 years ago |
YunaiV
|
3d3c88dd4f
|
完善 AdminUserServiceImpl 单元测试
|
3 years ago |
YunaiV
|
d897f8fb10
|
完善 SmsCodeServiceImpl 单元测试
|
3 years ago |
YunaiV
|
96e8fa4216
|
完善 RoleServiceImpl 单元测试
|
3 years ago |
YunaiV
|
3aeebef036
|
完善 MenuServiceImplTest 单元测试
|
3 years ago |
YunaiV
|
7731b4f503
|
Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/dev-yunai
|
3 years ago |
YunaiV
|
0537421655
|
完善 DictDataServiceImpl 单元测试
|
3 years ago |
YunaiV
|
bef06ef940
|
完善 PostServiceImpl 单元测试
|
3 years ago |
YunaiV
|
1011de3278
|
完善 DeptServiceImpl 单元测试
|
3 years ago |
YunaiV
|
1943e71e3f
|
站内信模块:完善注释
|
3 years ago |
YunaiV
|
ae3ee95cdd
|
站内信模块:整体功能实现
|
3 years ago |
YunaiV
|
143035d798
|
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 |
YunaiV
|
3783367605
|
邮箱模块:优化注释 + 方法名
|
3 years ago |
YunaiV
|
7e65ede92d
|
邮箱模块:优化注释 + 方法名
|
3 years ago |