 sangelxiu1
|
975665c548
|
Merge remote-tracking branch 'origin/dev' into dev
|
2025-09-28 12:22:59 +08:00 |
|
sangelxiu1
|
215106c4ac
|
## Opt - 市场动态
|
2025-09-28 12:22:51 +08:00 |
 cabbage
|
e5c1287d22
|
## 结算新字段兼容；
|
2025-09-28 11:32:20 +08:00 |
|
cabbage
|
4c27a9f9f1
|
Merge remote-tracking branch 'origin/dev' into dev
|
2025-09-28 11:31:36 +08:00 |
|
cabbage
|
9258dbb4e1
|
## 结算新字段兼容；
|
2025-09-28 11:31:25 +08:00 |
|
sangelxiu1
|
0a018f5539
|
## Opt - 市场动态
|
2025-09-28 11:12:56 +08:00 |
|
sangelxiu1
|
3b5a79806f
|
Merge remote-tracking branch 'origin/test' into test
|
2025-09-28 11:12:38 +08:00 |
|
sangelxiu1
|
994b670493
|
## Opt - 市场动态
|
2025-09-28 11:12:29 +08:00 |
 zhangheng
|
7374400936
|
## 前台返回提示修改
|
2025-09-28 10:04:27 +08:00 |
|
zhangheng
|
18f138caf1
|
## 前台返回提示修改
|
2025-09-28 09:28:28 +08:00 |
|
cabbage
|
f336435346
|
## 日结处理业绩；
|
2025-09-28 09:06:00 +08:00 |
|
cabbage
|
a2e0c521aa
|
## 日结处理业绩；
|
2025-09-28 09:04:49 +08:00 |
|
cabbage
|
e4e58f0253
|
Merge remote-tracking branch 'origin/dev' into test
# Conflicts:
# bd-business/bd-business-member/src/main/java/com/hzs/member/base/mapper/CuMemberRetailDetailMapper.java
# bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/ICumemberRetailDetailService.java
# bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/impl/ICumemberRetailDetailServiceImpl.java
# bd-business/bd-business-member/src/main/java/com/hzs/member/base/vo/memberPointVO.java
# bd-business/bd-business-member/src/main/java/com/hzs/member/structure/controller/api/ApiMemberStructureController.java
# bd-business/bd-business-member/src/main/java/com/hzs/member/structure/controller/manage/MemberStructureController.java
# bd-business/bd-business-member/src/main/resources/mapper/retail/member/CuMemberRetailDetailMapper.xml
|
2025-09-26 18:03:36 +08:00 |
|
cabbage
|
6db021e8b0
|
## 日结处理业绩；
|
2025-09-26 17:55:40 +08:00 |
|
cabbage
|
1595f11723
|
Merge remote-tracking branch 'origin/dev' into dev
|
2025-09-26 17:54:37 +08:00 |
|
cabbage
|
bc0f51446f
|
## 日结处理业绩；
|
2025-09-26 17:54:28 +08:00 |
|
zhangheng
|
f832063a17
|
## 导出请求修改
|
2025-09-26 17:49:09 +08:00 |
|
zhangheng
|
e1da81afaa
|
## 导出请求修改
|
2025-09-26 17:48:47 +08:00 |
|
zhangheng
|
db2d7f365c
|
## 导出请求值修改
|
2025-09-26 17:37:56 +08:00 |
|
zhangheng
|
89583fe096
|
## 导出请求值修改
|
2025-09-26 17:37:35 +08:00 |
|
zhangheng
|
611121162b
|
## bug419 导出接收字段修改
|
2025-09-26 17:17:42 +08:00 |
|
zhangheng
|
5ab49626cf
|
## bug419 导出接收字段修改
|
2025-09-26 17:17:20 +08:00 |
|
zhangheng
|
299686f9a9
|
## 导出修改,会员子点信息排序
|
2025-09-26 17:07:34 +08:00 |
|
zhangheng
|
2955a2038e
|
## 会员点位信息排序查询
|
2025-09-26 17:06:12 +08:00 |
|
zhangheng
|
caae0a9d5c
|
## 导出修改,会员子点信息排序
|
2025-09-26 17:00:22 +08:00 |
|
sangelxiu1
|
ca9890ad4c
|
## Opt - 秒结-甄选数据算在注册专区
|
2025-09-26 16:46:31 +08:00 |
|
sangelxiu1
|
5ade87a91d
|
Merge remote-tracking branch 'origin/dev' into dev
|
2025-09-26 16:45:32 +08:00 |
|
sangelxiu1
|
301648f213
|
## Opt - 秒结-甄选数据算在注册专区
|
2025-09-26 16:45:25 +08:00 |
|
zhangheng
|
110cef3674
|
## 会员点位信息排序查询
|
2025-09-26 16:39:18 +08:00 |
|
zhangheng
|
d71ce0a57b
|
## 会员点位信息分页返回值修改
|
2025-09-26 16:23:06 +08:00 |
|
zhangheng
|
ac43ec5553
|
## 会员点位信息分页返回值修改
|
2025-09-26 16:22:54 +08:00 |
|
zhangheng
|
2384859022
|
## 分页返回值修改
|
2025-09-26 16:14:35 +08:00 |
|
zhangheng
|
daa9efe4e5
|
## 分页返回值修改
|
2025-09-26 16:14:15 +08:00 |
|
zhangheng
|
9718739da4
|
## api会员子点信息只传当前会员信息
|
2025-09-26 16:06:40 +08:00 |
|
zhangheng
|
6832412c6f
|
## api会员子点信息只传当前会员信息
|
2025-09-26 16:06:26 +08:00 |
|
zhangheng
|
1393e24989
|
## 分页返回值修改
|
2025-09-26 15:50:51 +08:00 |
|
zhangheng
|
af5dbcc788
|
## 三阶段架构列表数据,会员子点位信息
|
2025-09-26 15:50:20 +08:00 |
|
zhangheng
|
2fe1c41a92
|
## 分页返回值修改
|
2025-09-26 15:41:09 +08:00 |
|
cabbage
|
1fea92b74b
|
## 赠点如果直推下没有可以填充的，则按血缘上逻辑走；
|
2025-09-26 15:20:18 +08:00 |
|
cabbage
|
a99c27a3ff
|
## 赠点如果直推下没有可以填充的，则按血缘上逻辑走；
|
2025-09-26 15:19:55 +08:00 |
|
cabbage
|
a41cd10d4d
|
## 赠点激活阶段填充处理；
|
2025-09-26 14:56:13 +08:00 |
|
cabbage
|
9afc8c69cf
|
## 赠点激活阶段填充处理；
|
2025-09-26 14:54:47 +08:00 |
|
zhangheng
|
6f6dcae8b8
|
## 会员点位信息为空
|
2025-09-26 14:09:32 +08:00 |
|
zhangheng
|
c2cad9d48e
|
## 会员点位信息为空
|
2025-09-26 14:09:08 +08:00 |
|
zhangheng
|
8e9d632d38
|
## 会员子点位会员编号非必传
|
2025-09-26 13:47:42 +08:00 |
|
zhangheng
|
12d91a47be
|
## 会员子点位信息添加导出
|
2025-09-26 13:47:40 +08:00 |
|
zhangheng
|
6c6696ee85
|
## 三阶段架构列表数据,会员子点位信息
|
2025-09-26 13:47:37 +08:00 |
|
zhangheng
|
8ee826e7f4
|
## 三阶段架构列表数据,会员子点位信息
|
2025-09-26 13:47:33 +08:00 |
|
zhangheng
|
478013dd99
|
## 三阶段架构列表数据
|
2025-09-26 13:47:25 +08:00 |
|
zhangheng
|
3066c799c5
|
## 三阶段架构会员名称添加点位信息
|
2025-09-26 13:47:17 +08:00 |