sangelxiu1
  • Joined on 2025-05-30
sangelxiu1 pushed to dev at angelo/java-retail-app 2025-06-17 13:58:29 +08:00
52f8a8585f Merge remote-tracking branch 'origin/dev' into dev
03780c8925 ## Fix - 盒数计算大小区后排除注水
Compare 2 commits »
sangelxiu1 pushed to dev at angelo/java-retail-app 2025-06-17 11:08:17 +08:00
b84e3439ee Merge remote-tracking branch 'origin/dev' into dev
b425609f79 ## Fix - teambox调整为不包含注水,计算大小区需要加上两个注水属性,计算总数时无需再排除注水
Compare 2 commits »
sangelxiu1 pushed to dev at angelo/java-retail-app 2025-06-17 09:39:37 +08:00
2bd224b3d4 Merge remote-tracking branch 'origin/dev' into dev
2615f517de ## Fix - 盒数(小区盒数) & 市场动态-本月盒数(日结.MONTH_BOX_NUM + TEAM_MONTH_BOX_NUM + 秒结.NEW_BOX_NUM + TEAM_NEW_BOX_NUM)
Compare 2 commits »
sangelxiu1 pushed to dev at angelo/java-retail-app 2025-06-16 10:00:20 +08:00
344f10a3e1 Merge remote-tracking branch 'origin/dev' into dev
9020247e9a ## Fix - 市场动态-业绩列表为0
Compare 2 commits »
sangelxiu1 pushed to dev at angelo/web-retail-h5 2025-06-16 09:51:51 +08:00
070f0e61cd Merge remote-tracking branch 'origin/dev' into dev
d056d843b8 ## Opt - 增加查询类型
Compare 2 commits »
sangelxiu1 pushed to dev at angelo/java-retail-app 2025-06-14 14:08:45 +08:00
ea76dfab3b Merge remote-tracking branch 'origin/dev' into dev
7f03ef8e7a ## Fix - 市场动态-小区业绩[bugID=197【H5】如截图,RE55691589这个会员的市场动态里,红框中的盒数和业绩应该有值才对]
Compare 2 commits »
sangelxiu1 pushed to dev at angelo/java-retail-app 2025-06-14 10:46:39 +08:00
3df2c1b987 ## Fix - 市场动态-小区业绩
sangelxiu1 pushed to dev at angelo/java-retail-app 2025-06-14 09:55:31 +08:00
7a88013554 ## Fix - 本月=昨日月 + 今日个人 + 今日团队
sangelxiu1 pushed to dev at angelo/java-retail-app 2025-06-14 09:47:46 +08:00
b0658f1bc3 Merge remote-tracking branch 'origin/dev' into dev
06653aaa9a ## Opt - 调整去除注水的位置
Compare 2 commits »
sangelxiu1 pushed to dev at angelo/java-retail-app 2025-06-13 18:25:18 +08:00
68141eb9ff Merge remote-tracking branch 'origin/dev' into dev
02453df49a ## Opt - 市场动态-查询条件
Compare 2 commits »
sangelxiu1 pushed to dev at angelo/java-retail-app 2025-06-13 18:14:23 +08:00
9d6fd9b7a8 Merge remote-tracking branch 'origin/dev' into dev
f0a8c658f5 ## Opt - 业绩独立大小区条件&市场动态列表接口
Compare 2 commits »
sangelxiu1 pushed to dev at angelo/java-retail-app 2025-06-13 15:26:02 +08:00
287cc279b4 Merge remote-tracking branch 'origin/dev' into dev
5577de14e5 ## Fix - 盒数大小区逻辑
Compare 2 commits »
sangelxiu1 pushed to dev at angelo/java-retail-app 2025-06-13 15:06:31 +08:00
f74abd210f ## Opt - 市场动态部分代码
sangelxiu1 pushed to dev at angelo/java-retail-app 2025-06-13 15:05:52 +08:00
8a87410289 ## Fix - 选择区域 计算自己业绩
sangelxiu1 pushed to dev at angelo/java-retail-app 2025-06-13 15:03:51 +08:00
be32dd5151 Merge remote-tracking branch 'origin/dev' into dev
bb175563f5 ## Fix - 选择区域 计算自己业绩
Compare 2 commits »
sangelxiu1 pushed to dev at angelo/java-retail-app 2025-06-13 14:33:14 +08:00
bfff613752 ## Opt - mq补偿增加业绩
sangelxiu1 pushed to dev at angelo/java-retail-app 2025-06-13 14:32:37 +08:00
d1a4f364ca Merge remote-tracking branch 'origin/dev' into dev
401adc07e0 ## Opt - mq补偿增加业绩
Compare 2 commits »
sangelxiu1 pushed to dev at angelo/java-retail-app 2025-06-13 13:53:04 +08:00
cf7924b143 Merge remote-tracking branch 'origin/dev' into dev
e0921965a7 ## Opt - 我的->盒数
Compare 2 commits »
sangelxiu1 pushed to dev at angelo/java-retail-app 2025-06-13 12:02:12 +08:00
8d3408c421 ## Opt - 我的->盒数
sangelxiu1 pushed to dev at angelo/java-retail-app 2025-06-13 11:41:22 +08:00
ac6dc2c5cd Merge remote-tracking branch 'origin/dev' into dev
3d3d250305 ## Fix - 新用户后台改等级 没有日结造成npe
Compare 2 commits »