sangelxiu1
							
						 | 
						
							
							
							
							
							
								
							
							
								c274fba09e
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev' into dev
							
							
							
							
							
						 | 
						
							2025-07-04 09:26:16 +08:00 | 
						
					
				
					
						
							
							
								
								 sangelxiu1
							
						 | 
						
							
							
							
							
							
								
							
							
								6b4256bf1e
								
							
						 | 
						
							
							
								
								## Opt - 选择区域业绩取值替换(ALL_)
							
							
							
							
							
						 | 
						
							2025-07-04 09:26:10 +08:00 | 
						
					
				
					
						
							
							
								
								 cabbage
							
						 | 
						
							
							
							
							
							
								
							
							
								91a474d8a7
								
							
						 | 
						
							
							
								
								## 商品指定某个会员可见;
							
							
							
							
							
						 | 
						
							2025-07-03 13:43:46 +08:00 | 
						
					
				
					
						
							
							
								
								 sangelxiu1
							
						 | 
						
							
							
							
							
							
								
							
							
								aa282c7cde
								
							
						 | 
						
							
							
								
								## Opt - 秒结盒数&业绩取值替换(ALL_)
							
							
							
							
							
						 | 
						
							2025-07-02 10:12:00 +08:00 | 
						
					
				
					
						
							
							
								
								 sangelxiu1
							
						 | 
						
							
							
							
							
							
								
							
							
								54ff93f8d6
								
							
						 | 
						
							
							
								
								## Fix - H5体系-区域选择
							
							
							
							
							
						 | 
						
							2025-07-02 09:23:10 +08:00 | 
						
					
				
					
						
							
							
								
								 sangelxiu1
							
						 | 
						
							
							
							
							
							
								
							
							
								d00a640aa9
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev' into dev
							
							
							
							
							
						 | 
						
							2025-07-01 15:21:05 +08:00 | 
						
					
				
					
						
							
							
								
								 sangelxiu1
							
						 | 
						
							
							
							
							
							
								
							
							
								ab3a0185d3
								
							
						 | 
						
							
							
								
								## Fix - H5体系-区域选择
							
							
							
							
							
						 | 
						
							2025-07-01 15:21:00 +08:00 | 
						
					
				
					
						
							
							
								
								 cabbage
							
						 | 
						
							
							
							
							
							
								
							
							
								f887de2082
								
							
						 | 
						
							
							
								
								## 每月区域考核数据生成;
							
							
							
							
							
						 | 
						
							2025-07-01 14:53:45 +08:00 | 
						
					
				
					
						
							
							
								
								 sangelxiu1
							
						 | 
						
							
							
							
							
							
								
							
							
								6a40dcbe85
								
							
						 | 
						
							
							
								
								## Fix - 【H5】红框中的盒数都得保留2为小数[214] & 【H5】测试环境,BF28195798这个会员伞下一个人都没有,他市场动态下面无数个人[215]
							
							
							
							
							
						 | 
						
							2025-07-01 14:23:54 +08:00 | 
						
					
				
					
						
							
							
								
								 sangelxiu1
							
						 | 
						
							
							
							
							
							
								
							
							
								01ea3d0601
								
							
						 | 
						
							
							
								
								## Fix - 【H5】红框中的盒数都得保留2为小数[214] & 【H5】测试环境,BF28195798这个会员伞下一个人都没有,他市场动态下面无数个人[215]
							
							
							
							
							
						 | 
						
							2025-07-01 14:16:54 +08:00 | 
						
					
				
					
						
							
							
								
								 sangelxiu1
							
						 | 
						
							
							
							
							
							
								
							
							
								9599b37967
								
							
						 | 
						
							
							
								
								## Fix - npe
							
							
							
							
							
						 | 
						
							2025-07-01 11:47:40 +08:00 | 
						
					
				
					
						
							
							
								
								 sangelxiu1
							
						 | 
						
							
							
							
							
							
								
							
							
								37307e859c
								
							
						 | 
						
							
							
								
								## Opt - 区域体系增加查询条件
							
							
							
							
							
						 | 
						
							2025-06-30 14:12:04 +08:00 | 
						
					
				
					
						
							
							
								
								 sangelxiu1
							
						 | 
						
							
							
							
							
							
								
							
							
								cfc9511687
								
							
						 | 
						
							
							
								
								## Feat - 盒数调整为小数
							
							
							
							
							
						 | 
						
							2025-06-30 11:16:47 +08:00 | 
						
					
				
					
						
							
							
								
								 sangelxiu1
							
						 | 
						
							
							
							
							
							
								
							
							
								c48916fd6e
								
							
						 | 
						
							
							
								
								## Feat - 选择区域增加小区10W验证&按体系分组绑定区域
							
							
							
							
							
						 | 
						
							2025-06-30 10:27:44 +08:00 | 
						
					
				
					
						
							
							
								
								 sangelxiu1
							
						 | 
						
							
							
							
							
							
								
							
							
								93b2b029a5
								
							
						 | 
						
							
							
								
								## Feat - 清理数据Job (del_flag = 1 & 30天 awards/level/grade)
							
							
							
							
							
						 | 
						
							2025-06-27 11:41:52 +08:00 | 
						
					
				
					
						
							
							
								
								 sangelxiu1
							
						 | 
						
							
							
							
							
							
								
							
							
								7b1889f6b1
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev' into dev
							
							
							
							
							
						 | 
						
							2025-06-27 11:27:49 +08:00 | 
						
					
				
					
						
							
							
								
								 sangelxiu1
							
						 | 
						
							
							
							
							
							
								
							
							
								9f9bdc17ed
								
							
						 | 
						
							
							
								
								## Feat - 清理数据Job (del_flag = 1 & 30天 awards/level/grade)
							
							
							
							
							
						 | 
						
							2025-06-27 11:27:30 +08:00 | 
						
					
				
					
						
							
							
								
								 cabbage
							
						 | 
						
							
							
							
							
							
								
							
							
								5b920ff44f
								
							
						 | 
						
							
							
								
								## 去掉不用的4-N等老奖金处理;去掉荣誉墙、推荐达人等;
							
							
							
							
							
						 | 
						
							2025-06-26 10:00:16 +08:00 | 
						
					
				
					
						
							
							
								
								 cabbage
							
						 | 
						
							
							
							
							
							
								
							
							
								04cde3b30d
								
							
						 | 
						
							
							
								
								## 去掉部分不需要的实体及注释;
							
							
							
							
							
						 | 
						
							2025-06-25 13:56:04 +08:00 | 
						
					
				
					
						
							
							
								
								 cabbage
							
						 | 
						
							
							
							
							
							
								
							
							
								967e0e851d
								
							
						 | 
						
							
							
								
								## 月度分红处理;
							
							
							
							
							
						 | 
						
							2025-06-23 16:43:49 +08:00 | 
						
					
				
					
						
							
							
								
								 sangelxiu1
							
						 | 
						
							
							
							
							
							
								
							
							
								c1bb43f3bd
								
							
						 | 
						
							
							
								
								## Opt - 增加修改结算等级->最高等级下进行奖衔初始化
							
							
							
							
							
						 | 
						
							2025-06-20 18:15:13 +08:00 | 
						
					
				
					
						
							
							
								
								 cabbage
							
						 | 
						
							
							
							
							
							
								
							
							
								17e5a70f85
								
							
						 | 
						
							
							
								
								## 会员列表返回分红奖衔;当月奖衔分析搜索条件报错处理;
							
							
							
							
							
						 | 
						
							2025-06-19 16:06:30 +08:00 | 
						
					
				
					
						
							
							
								
								 cabbage
							
						 | 
						
							
							
							
							
							
								
							
							
								7a17c2127e
								
							
						 | 
						
							
							
								
								## get-info返回分红奖衔;
							
							
							
							
							
						 | 
						
							2025-06-19 15:39:54 +08:00 | 
						
					
				
					
						
							
							
								
								 sangelxiu1
							
						 | 
						
							
							
							
							
							
								
							
							
								f7f995c9c3
								
							
						 | 
						
							
							
								
								## Feat - 手改注册等级为合伙人时,如奖衔为空,则改为黄宝
							
							
							
							
							
						 | 
						
							2025-06-19 13:38:58 +08:00 | 
						
					
				
					
						
							
							
								
								 sangelxiu1
							
						 | 
						
							
							
							
							
							
								
							
							
								8804791eca
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev' into dev
							
							
							
							
							
						 | 
						
							2025-06-18 11:06:44 +08:00 | 
						
					
				
					
						
							
							
								
								 sangelxiu1
							
						 | 
						
							
							
							
							
							
								
							
							
								f4e2d9a16d
								
							
						 | 
						
							
							
								
								## Fix - 自动登录,获取systemType异常
							
							
							
							
							
						 | 
						
							2025-06-18 11:06:38 +08:00 | 
						
					
				
					
						
							
							
								
								 cabbage
							
						 | 
						
							
							
							
							
							
								
							
							
								2feb0076e1
								
							
						 | 
						
							
							
								
								## 免密登录不校验用户支付状态;去掉7位用户编号单独登录方法;
							
							
							
							
							
						 | 
						
							2025-06-18 10:55:44 +08:00 | 
						
					
				
					
						
							
							
								
								 cabbage
							
						 | 
						
							
							
							
							
							
								
							
							
								7bf86ffad5
								
							
						 | 
						
							
							
								
								## 处理业绩表方法;
							
							
							
							
							
						 | 
						
							2025-06-17 17:33:53 +08:00 | 
						
					
				
					
						
							
							
								
								 cabbage
							
						 | 
						
							
							
							
							
							
								
							
							
								f79e4a7ab6
								
							
						 | 
						
							
							
								
								## 真实奖衔分析、等级升级查询;
							
							
							
							
							
						 | 
						
							2025-06-17 16:57:14 +08:00 | 
						
					
				
					
						
							
							
								
								 cabbage
							
						 | 
						
							
							
							
							
							
								
							
							
								45e3ec095c
								
							
						 | 
						
							
							
								
								## 去掉旧抗衰达人,调整推荐相关列表;
							
							
							
							
							
						 | 
						
							2025-06-17 16:03:53 +08:00 | 
						
					
				
					
						
							
							
								
								 cabbage
							
						 | 
						
							
							
							
							
							
								
							
							
								e89e09371f
								
							
						 | 
						
							
							
								
								## 等级修改、0元注册、删除空点相关接口调整;
							
							
							
							
							
						 | 
						
							2025-06-17 15:43:29 +08:00 | 
						
					
				
					
						
							
							
								
								 sangelxiu1
							
						 | 
						
							
							
							
							
							
								
							
							
								03780c8925
								
							
						 | 
						
							
							
								
								## Fix - 盒数计算大小区后排除注水
							
							
							
							
							
						 | 
						
							2025-06-17 13:58:19 +08:00 | 
						
					
				
					
						
							
							
								
								 sangelxiu1
							
						 | 
						
							
							
							
							
							
								
							
							
								b425609f79
								
							
						 | 
						
							
							
								
								## Fix - teambox调整为不包含注水,计算大小区需要加上两个注水属性,计算总数时无需再排除注水
							
							
							
							
							
						 | 
						
							2025-06-17 11:08:06 +08:00 | 
						
					
				
					
						
							
							
								
								 sangelxiu1
							
						 | 
						
							
							
							
							
							
								
							
							
								2615f517de
								
							
						 | 
						
							
							
								
								## Fix - 盒数(小区盒数) & 市场动态-本月盒数(日结.MONTH_BOX_NUM + TEAM_MONTH_BOX_NUM + 秒结.NEW_BOX_NUM + TEAM_NEW_BOX_NUM)
							
							
							
							
							
						 | 
						
							2025-06-17 09:39:25 +08:00 | 
						
					
				
					
						
							
							
								
								 cabbage
							
						 | 
						
							
							
							
							
							
								
							
							
								ad8c536b68
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev' into dev
							
							
							
							
							
						 | 
						
							2025-06-16 10:09:49 +08:00 | 
						
					
				
					
						
							
							
								
								 cabbage
							
						 | 
						
							
							
							
							
							
								
							
							
								b386dda7ba
								
							
						 | 
						
							
							
								
								## 等级处理改为逻辑删除;
							
							
							
							
							
						 | 
						
							2025-06-16 10:09:45 +08:00 | 
						
					
				
					
						
							
							
								
								 sangelxiu1
							
						 | 
						
							
							
							
							
							
								
							
							
								344f10a3e1
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev' into dev
							
							
							
							
							
						 | 
						
							2025-06-16 10:00:16 +08:00 | 
						
					
				
					
						
							
							
								
								 sangelxiu1
							
						 | 
						
							
							
							
							
							
								
							
							
								9020247e9a
								
							
						 | 
						
							
							
								
								## Fix - 市场动态-业绩列表为0
							
							
							
							
							
						 | 
						
							2025-06-16 10:00:11 +08:00 | 
						
					
				
					
						
							
							
								
								 cabbage
							
						 | 
						
							
							
							
							
							
								
							
							
								7cb0035eb7
								
							
						 | 
						
							
							
								
								## 奖衔处理全部改为逻辑删除和查询;
							
							
							
							
							
						 | 
						
							2025-06-16 09:44:45 +08:00 | 
						
					
				
					
						
							
							
								
								 cabbage
							
						 | 
						
							
							
							
							
							
								
							
							
								e0fafbe410
								
							
						 | 
						
							
							
								
								## 收货地址调整注释;
							
							
							
							
							
						 | 
						
							2025-06-16 09:09:50 +08:00 | 
						
					
				
					
						
							
							
								
								 sangelxiu1
							
						 | 
						
							
							
							
							
							
								
							
							
								ea76dfab3b
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev' into dev
							
							
							
							
							
						 | 
						
							2025-06-14 14:08:40 +08:00 | 
						
					
				
					
						
							
							
								
								 sangelxiu1
							
						 | 
						
							
							
							
							
							
								
							
							
								7f03ef8e7a
								
							
						 | 
						
							
							
								
								## Fix - 市场动态-小区业绩[bugID=197【H5】如截图,RE55691589这个会员的市场动态里,红框中的盒数和业绩应该有值才对]
							
							
							
							
							
						 | 
						
							2025-06-14 14:08:33 +08:00 | 
						
					
				
					
						
							
							
								
								 cabbage
							
						 | 
						
							
							
							
							
							
								
							
							
								c26b132642
								
							
						 | 
						
							
							
								
								## 空单注册报错处理(195);
							
							
							
							
							
						 | 
						
							2025-06-14 14:07:03 +08:00 | 
						
					
				
					
						
							
							
								
								 cabbage
							
						 | 
						
							
							
							
							
							
								
							
							
								c98511ecb3
								
							
						 | 
						
							
							
								
								## 修改户籍短信校验调整(181);
							
							
							
							
							
						 | 
						
							2025-06-14 13:29:18 +08:00 | 
						
					
				
					
						
							
							
								
								 cabbage
							
						 | 
						
							
							
							
							
							
								
							
							
								836b1fbdea
								
							
						 | 
						
							
							
								
								## 空单注册是否激活处理(195);
							
							
							
							
							
						 | 
						
							2025-06-14 11:10:24 +08:00 | 
						
					
				
					
						
							
							
								
								 sangelxiu1
							
						 | 
						
							
							
							
							
							
								
							
							
								3df2c1b987
								
							
						 | 
						
							
							
								
								## Fix - 市场动态-小区业绩
							
							
							
							
							
						 | 
						
							2025-06-14 10:46:33 +08:00 | 
						
					
				
					
						
							
							
								
								 sangelxiu1
							
						 | 
						
							
							
							
							
							
								
							
							
								7a88013554
								
							
						 | 
						
							
							
								
								## Fix - 本月=昨日月 + 今日个人 + 今日团队
							
							
							
							
							
						 | 
						
							2025-06-14 09:55:24 +08:00 | 
						
					
				
					
						
							
							
								
								 sangelxiu1
							
						 | 
						
							
							
							
							
							
								
							
							
								b0658f1bc3
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev' into dev
							
							
							
							
							
						 | 
						
							2025-06-14 09:47:41 +08:00 | 
						
					
				
					
						
							
							
								
								 sangelxiu1
							
						 | 
						
							
							
							
							
							
								
							
							
								06653aaa9a
								
							
						 | 
						
							
							
								
								## Opt - 调整去除注水的位置
							
							
							
							
							
						 | 
						
							2025-06-14 09:47:34 +08:00 | 
						
					
				
					
						
							
							
								
								 cabbage
							
						 | 
						
							
							
							
							
							
								
							
							
								da6ffb525d
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev' into dev
							
							
							
							
							
						 | 
						
							2025-06-14 09:45:38 +08:00 |