4662 Commits (02bc9d28deaab50b156280899ca0c77fea9a168c)
 

Author SHA1 Message Date
YunaiV 02bc9d28de 解决 MapStruct 的时区问题 2 years ago
YunaiV 3dd273a30d Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro 2 years ago
芋道源码 6696bb8943
!586 解决MapStruct进行LocalDateTime和Date转换时的时区问题,使用Mapper注解的uses参数
Merge pull request !586 from clockdotnet/master_pr
2 years ago
芋道源码 40560f9618
!569 fix: posgres sql
Merge pull request !569 from 天天写BUG/master
2 years ago
YunaiV 7d99c6dbe8 Merge branch 'master' of https://github.com/YunaiV/ruoyi-vue-pro 2 years ago
芋道源码 544e650e15
Merge pull request #326 from Lemon-cc-hang/base
fix: 在调用 selectList() 的时候 如果 Collection 参数为空会报错 sql 异常
2 years ago
YunaiV acee734554 Merge branch 'master' of https://github.com/YunaiV/ruoyi-vue-pro 2 years ago
芋道源码 17f0297fb6
Merge pull request #332 from oah1021/expression
使用Parenthesis为原有表达式添加括号
2 years ago
芋道源码 3badd5158c
!589 新增 管理后台 用户收件地址管理接口
Merge pull request !589 from 风狗/管理后台_用户收件地址管理接口
2 years ago
芋道源码 e490195cbc
!587 获取用户信息接口增加areaName 字段
Merge pull request !587 from 风狗/用户信息接口增加areaName字段
2 years ago
绮梦 65eddc63af feat: 增加管理后台用户收件地址管理接口。 2 years ago
JUNHAO 5cc3e6510b 使用Parenthesis为原有表达式添加括号 2 years ago
绮梦 55cae6d2aa feat: 获取用户信息接口增加areaName 字段。 2 years ago
shizhong 81c12b1852 解决MapStruct的时区问题 2 years ago
shizhong eb4434ecbc 解决MapStruct的时区问题 2 years ago
芋道源码 287a17a9ff
!583 调整 获取用户积分记录 和 获取用户签到记录接口 配合前端用户详情页面
Merge pull request !583 from 风狗/会员详情
2 years ago
绮梦 0753df68b8 feat: 获取用户积分记录 接口增加对userId 的支持,获取用户签到记录接口增加对userId的支持。 2 years ago
芋道源码 8f9404f99b
!579 同步商城实现:会员列表、会员积分、会员签到、会员标签
Merge pull request !579 from 芋道源码/feature/mall_product
2 years ago
YunaiV c3e4e23459 同步最新 Member 菜单 2 years ago
芋道源码 3124948175
!578 同步商城实现:会员列表、会员积分、会员签到、会员标签
Merge pull request !578 from 芋道源码/feature/mall_product
2 years ago
YunaiV 281ba1e369 code review:调整错误码分段 2 years ago
YunaiV a83c156bf1 code review:签到记录 2 years ago
YunaiV c5e85f3bfb code review:签到配置 2 years ago
YunaiV 4257cad46a code review:会员积分 2 years ago
YunaiV c7285da9a7 code review:会员签到配置 2 years ago
YunaiV bfc72a9802 Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/mall_product
 Conflicts:
	yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/point/vo/config/MemberPointConfigBaseVO.java
2 years ago
芋道源码 fe53e426a4
!573 fix: required = true ==> requiredMode = Schema.RequiredMode.REQUIRED
Merge pull request !573 from Carry/master
2 years ago
芋道源码 29ae1bcbca
!575 会员积分和会员签到模块todo修改
Merge pull request !575 from QingX/feature/mall_product
2 years ago
YunaiV 2584911d88 code review:会员标签 2 years ago
YunaiV 8191d9e141 Merge branch 'member_dev' of https://gitee.com/CrazyWorld/ruoyi-vue-pro into feature/mall_product
 Conflicts:
	yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/dataobject/user/MemberUserDO.java
2 years ago
YunaiV 95254341a1 1. 会员用户的找回密码 API 的优化 3 years ago
owen 4f589cad53 会员:
1.会员设置标签
3 years ago
YunaiV 5d4a7ffa3b 1. 会员用户的修改密码 API 的优化 3 years ago
YunaiV 87e5b2bed1 1. 会员用户的修改手机 API 的优化 3 years ago
YunaiV 4153331535 1. 合并 member 修改昵称和头像接口,统一成修改基本信息 API 3 years ago
YunaiV 94a32d34b2 1. 会员用户,增加 point 积分字段
2. 增加获得优惠劵、收藏数量的 API 接口
3 years ago
owen 9b6e2114c7 会员:
1.增加会员标签功能
3 years ago
YunaiV a4e2cacc46 会员中心:会员管理 60% 3 years ago
YunaiV e8c1bdde3d 会员中心:会员管理 50% 3 years ago
xiaqing db1f44305d 会员积分和会员签到模块todo修改 3 years ago
xiaqing 2e9dfac9ab 会员积分和会员签到模块todo修改 3 years ago
YunaiV 61fbb9909a 订单:
1、简化交易订单的逻辑
3 years ago
YunaiV fe07e223e4 订单:
1、简化交易订单的逻辑
3 years ago
YunaiV f217ba0807 售后:
1、完善整个流程的实现
3 years ago
wanglei 6446b753d3 fix: required = true ==> requiredMode = Schema.RequiredMode.REQUIRED 3 years ago
YunaiV 97fc4027de Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product
# Conflicts:
#	yudao-module-mall/yudao-module-promotion-biz/src/test/java/cn/iocoder/yudao/module/promotion/service/decorate/DecorateComponentServiceImplTest.java
3 years ago
YunaiV 5dd6e5bee8 营销:
1. 售后订单,增加对 afterSaleId 的更新
3 years ago
jason 6fbf7b261b 扫码支付统一退款单元测试, 修复退款失败,渠道错误未赋值bug 3 years ago
YunaiV d3c02f2a57 Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product 3 years ago
YunaiV c3de25e760 营销:
1. 调整店铺装修接口
3 years ago