jason
|
86598dd177
|
转账 - 动态收款人字段修改
|
2023-10-24 08:44:30 +08:00 |
|
zyna
|
918ffc40ae
|
crm联系人前端init
|
2023-10-22 16:40:57 +08:00 |
|
YunaiV
|
723707c7ed
|
Merge branch 'feature/crm' of https://gitee.com/zyna/ruoyi-vue-pro into feature/crm
# Conflicts:
# sql/mysql/crm.sql
# yudao-module-crm/yudao-module-crm-api/src/main/java/cn/iocoder/yudao/module/crm/enums/ErrorCodeConstants.java
|
2023-10-21 22:13:34 +08:00 |
|
YunaiV
|
9cf4cfca86
|
Merge branch 'feature/crm' of https://gitee.com/jiangwanwan/ruoyi-vue-pro into feature/crm
# Conflicts:
# sql/mysql/crm.sql
|
2023-10-21 22:00:15 +08:00 |
|
YunaiV
|
56b59cf383
|
Merge branch 'feature/crm' of https://gitee.com/souvc/ruoyi-vue-pro into feature/crm
# Conflicts:
# sql/mysql/crm.sql
# sql/mysql/crm_menu.sql
# yudao-module-crm/yudao-module-crm-api/src/main/java/cn/iocoder/yudao/module/crm/enums/ErrorCodeConstants.java
|
2023-10-21 21:41:16 +08:00 |
|
jason
|
89e847c8cd
|
钱包，转账 review 修改
|
2023-10-21 15:28:07 +08:00 |
|
913752709@qq.com
|
e4eeaa1d69
|
feat: crm 线索表完善 review 提到的问题
|
2023-10-21 00:53:18 +08:00 |
|
liuhongfeng
|
34a5785768
|
【新增】回款计划 功能
|
2023-10-20 23:48:19 +08:00 |
|
zyna
|
e4943f0dfa
|
crm联系人
|
2023-10-20 23:42:22 +08:00 |
|
liuhongfeng
|
73f4fc8ceb
|
【新增】回款管理 功能
|
2023-10-20 22:16:34 +08:00 |
|
ljlleo
|
01490c879c
|
商机sql
|
2023-10-20 16:14:45 +08:00 |
|
芋道源码
|
8bd1942083
|
!676 交易：核销订单
Merge pull request !676 from 疯狂的世界/feature/mall_product
|
2023-10-19 15:59:00 +00:00 |
|
YunaiV
|
f8e4aece31
|
Merge branch 'feature/mall_product' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/mall_product
|
2023-10-19 23:31:21 +08:00 |
|
wanwan
|
48661f980c
|
!679 feat: CRM 线索表 crud
* feat: CRM 线索表 crud
* feat: CRM 线索表 crud
|
2023-10-19 14:52:16 +00:00 |
|
YunaiV
|
d256275099
|
saas：支持社交应用的多租户配置
|
2023-10-18 23:48:14 +08:00 |
|
913752709@qq.com
|
a09ee495b6
|
feat: CRM 线索表 crud
|
2023-10-18 19:53:15 +08:00 |
|
zhijiantianya@gmail.com
|
00e18a480f
|
code review：钱包、充值、转账的实现
|
2023-10-18 18:39:05 +08:00 |
|
owen
|
0c4713b7e0
|
Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product
# Conflicts:
# sql/mysql/mall.sql
|
2023-10-17 23:29:11 +08:00 |
|
YunaiV
|
5842a361e2
|
同步最新 SQL 脚本
|
2023-10-17 23:23:17 +08:00 |
|
owen
|
0612a13cce
|
交易：核销订单
|
2023-10-17 23:18:08 +08:00 |
|
dhb52
|
164be5732b
|
feat: CRM/合同管理 - SQL
|
2023-10-16 23:53:27 +08:00 |
|
YunaiV
|
d2112458d2
|
Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product
|
2023-10-16 22:51:28 +08:00 |
|
YunaiV
|
1ff9bc6a71
|
code review：文章管理
|
2023-10-16 22:51:19 +08:00 |
|
jason
|
34210d3534
|
Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product
|
2023-10-16 22:43:54 +08:00 |
|
jason
|
7d0bcf5d3b
|
wallet - 管理端钱包余额菜单脚本
|
2023-10-16 22:43:39 +08:00 |
|
owen
|
6f08645f61
|
会员：增加字段【注册终端】
|
2023-10-16 14:22:43 +08:00 |
|
owen
|
df70402484
|
Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product
|
2023-10-16 09:55:17 +08:00 |
|
owen
|
f5dac38ca5
|
商城：增加商城首页
|
2023-10-16 09:51:20 +08:00 |
|
jason
|
3db7b30e66
|
Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product
|
2023-10-16 08:46:44 +08:00 |
|
jason
|
fcbbbc737d
|
wallet - 管理端, 充值套餐脚本
|
2023-10-16 08:46:27 +08:00 |
|
YunaiV
|
ca5e3f7bd1
|
优化最新的商城的 sql
|
2023-10-14 22:00:30 +08:00 |
|
jason
|
2e207019b3
|
Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product
|
2023-10-12 22:21:17 +08:00 |
|
jason
|
571961b4da
|
充值套餐修改
|
2023-10-12 22:20:42 +08:00 |
|
owen
|
df16278a03
|
统计：会员统计
|
2023-10-09 23:27:10 +08:00 |
|
YunaiV
|
6a04d6c458
|
promotion：新增助力记录列表
|
2023-10-05 12:43:14 +08:00 |
|
YunaiV
|
d4417d2474
|
code review：积分、优惠劵、佣金等逻辑
|
2023-10-01 23:31:07 +08:00 |
|
YunaiV
|
057952bdeb
|
Merge branch 'feature/mall_product' of https://gitee.com/CrazyWorld/ruoyi-vue-pro into feature/mall_product
# Conflicts:
# yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/util/date/LocalDateTimeUtils.java
|
2023-10-01 22:00:31 +08:00 |
|
YunaiV
|
b74169acfc
|
trade：优化订单列表的查询
|
2023-10-01 21:59:51 +08:00 |
|
owen
|
2168145c3e
|
会员：会员配置的积分相关字段加上point前缀
|
2023-10-01 10:41:21 +08:00 |
|
owen
|
ab35fcbe9b
|
会员：积分配置改为会员配置
|
2023-10-01 10:25:18 +08:00 |
|
owen
|
4f03635fcd
|
签到：签到后增加用户积分、经验
|
2023-10-01 09:53:54 +08:00 |
|
owen
|
e7876b1520
|
Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product
|
2023-09-30 22:09:49 +08:00 |
|
YunaiV
|
16cea61435
|
wallet：增加充值套餐
|
2023-09-30 18:54:10 +08:00 |
|
owen
|
42a899c5d3
|
交易：订单增加字段 推广人编号
|
2023-09-30 17:49:38 +08:00 |
|
owen
|
497ea2eee8
|
会员详情，修改会员积分
|
2023-09-30 15:50:13 +08:00 |
|
owen
|
929ff4286a
|
Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product
|
2023-09-29 21:08:49 +08:00 |
|
owen
|
171161e6c7
|
统计：交易统计
|
2023-09-29 21:08:15 +08:00 |
|
jason
|
57d782bc94
|
Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product
# Conflicts:
# yudao-module-pay/yudao-module-pay-api/src/main/java/cn/iocoder/yudao/module/pay/enums/ErrorCodeConstants.java
|
2023-09-29 14:06:12 +08:00 |
|
jason
|
ce6f7ab1b1
|
Pay: 新增转账示例单
|
2023-09-29 14:01:58 +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 |
|