lxd/FlowPacs
2
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity
6,116 Commits 2 Branches 0 Tags 165 MiB
53badfc367
Commit Graph

160 Commits

Author SHA1 Message Date
anhaohao
fdd5d55fc8 Merge remote-tracking branch 'origin/develop' into develop 2024-01-28 20:11:00 +08:00
anhaohao
65d7f8c4ab 新增：CRM 商业智能，合同金额排行榜和回款金额排行榜 2024-01-28 20:06:56 +08:00
YunaiV
722223c659 Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into develop 
# Conflicts:
#	yudao-module-mall/yudao-module-product-biz/src/test/java/cn/iocoder/yudao/module/product/service/comment/ProductCommentServiceImplTest.java
 2024-01-27 16:44:58 +08:00
YunaiV
814b6f688d 📖 CRM：code review 跟进记录 2024-01-26 23:46:02 +08:00
YunaiV
6a6e95fcb6 ✨ 对齐 BOOT 与 CLOUD 的代码 2024-01-19 22:13:55 +08:00
puhui999
eaa8e4be96 操作日志字段解析方法调整 2024-01-13 22:29:05 +08:00
YunaiV
e79c750b46 📖 CRM：code review 跟进记录的实现 2024-01-13 09:56:53 +08:00
puhui999
9bba1ce8a4 新增 ParseFunctionNameConstants 常量枚举 2024-01-10 11:29:29 +08:00
puhui999
68f5edaa88 CRM-客户: 完善一些 TODO 2024-01-06 15:28:10 +08:00
puhui999
a1c17b9b00 CRM-客户：日志表达式调整 2024-01-05 17:40:21 +08:00
puhui999
6950368991 操作日志：完善 code review 提到的问题 2023-12-26 00:04:20 +08:00
puhui999
7286f33a7f Merge remote-tracking branch 'yudao/develop' into develop 2023-12-24 00:32:47 +08:00
YunaiV
7b482f5729 ✨ Member：增加获取单个社交用户的接口 2023-12-23 21:48:33 +08:00
YunaiV
d65c28d7f7 ✨ Member：社交登录逻辑调整，如果登录时无用户，则自动创建用户，保持和各 App 统一逻辑 2023-12-23 09:59:58 +08:00
puhui999
a05d3bc1d1 Merge remote-tracking branch 'yudao/develop' into develop 2023-12-19 18:44:34 +08:00
puhui999
f56d8a2751 重构操作日志记录实现 2023-12-19 18:34:51 +08:00
puhui999
1fae341cae 重构操作日志记录实现 2023-12-19 16:29:13 +08:00
puhui999
3bab9748db 系统操作日志：使用自定义 starter 的方式重新集成 mzt-biz-log 2023-12-19 09:20:47 +08:00
YunaiV
b4612262b3 ✨ MEMBER：修改密码时，发送验证码无需传递 mobile，通过 user 查询 2023-12-17 23:46:48 +08:00
YunaiV
ddb6fe7ec8 📖 CRM：code review 客户管理的数据权限、操作权限 2023-12-17 10:57:49 +08:00
puhui999
daf4651a4f 系统操作日志：集成 mzt-biz-log 5，增加日志保存和查询接口 2023-12-14 18:45:13 +08:00
puhui999
c5cc818a49 系统操作日志：集成 mzt-biz-log 2023-12-12 22:29:40 +08:00
YunaiV
23df8633f4 📖 CRM：code review 数据权限的实现 2023-12-09 10:50:47 +08:00
puhui999
5c395fc1c4 CRM: 完善 code review 数据权限提到的问题，重新封装 CrmQueryWrapperUtils 2023-12-08 15:27:58 +08:00
YunaiV
98697ee075 ⬆️ 2023-12-07 20:48:11 +08:00
YunaiV
3707662187 📈 CRM：code review 数据权限 2023-12-06 20:04:15 +08:00
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
 2023-12-06 19:33:04 +08:00
puhui999
455a4ebc7b CRM-客户：实现数据权限、场景检索和公海数据分页查询 2023-12-05 15:04:53 +08:00
YunaiV
2dd835893a 🔧 简化 permission 模块的 VO 2023-12-02 21:47:03 +08:00
YunaiV
455f8e49fb crm：code review 联系人 2023-11-27 20:42:35 +08:00
zyna
3f3899f5d3 crm联系人review修改，新增地区字段 2023-11-27 20:42:34 +08:00
YunaiV
6f135303d8 sms：移除 SmsCodeMapping + SmsCommonResult，简化短信的封装 2023-11-21 22:14:07 +08:00
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
 2023-11-18 22:25:13 +08:00
YunaiV
8c9c91f0ca crm：code review 配置管理 2023-11-18 22:12:12 +08:00
YunaiV
f5ea270be3 部门：优化父部门的校验逻辑，为代码生成做个铺垫？！ 2023-11-16 12:55:43 +08:00
puhui999
668fae9398 CRM-数据权限：完善 code review 提到的问题 2023-11-07 17:52:18 +08:00
YunaiV
feba904fd8 多租户：登录界面，根据 host 域名获取对应的租户编号 2023-11-06 19:47:21 +08:00
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
 2023-11-04 20:48:27 +08:00
YunaiV
87bc3f510c 优化：社交登录、用户的管理 2023-11-04 14:37:36 +08:00
puhui999
12ae5bf128 新增社交用户 RUD 2023-10-25 16:57:13 +08:00
puhui999
738fcef453 新增社交客户端 CRUD 2023-10-25 16:07:17 +08:00
YunaiV
728308cbc0 member：优化部分变量的命名 2023-10-22 16:35:48 +08:00
YunaiV
979b484d7f saas：支持社交应用的多租户配置（wx 小程序） 2023-10-19 21:42:39 +08:00
YunaiV
6f757e5297 saas：支持社交应用的多租户配置（mp） 2023-10-19 12:54:44 +08:00
YunaiV
d256275099 saas：支持社交应用的多租户配置 2023-10-18 23:48:14 +08:00
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
 2023-09-28 15:18:59 +08:00
owen
e9fd377772 分销：Review代码修改 2023-09-24 20:28:44 +08:00
owen
637ae8ce1d 分佣: 提现记录 2023-09-22 18:35:43 +08:00
YunaiV
b81ebe6f19 修复 common 下的 test 引入不正确的问题，减少包依赖大小 2023-09-17 01:37:10 +08:00
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
 2023-09-11 16:19:55 +08:00