tangqian
|
2fc7ef07f8
|
fix: 修改部门
|
2023-06-01 13:26:31 +08:00 |
tangqian
|
236d4b566b
|
fix: 修改部门
|
2023-06-01 12:02:45 +08:00 |
tangqian
|
bec5e56add
|
fix: 修改部门
|
2023-06-01 11:27:49 +08:00 |
tangqian
|
451747bd24
|
fix: 修改部门
|
2023-06-01 11:24:18 +08:00 |
tangqian
|
9f9cb30b03
|
fix: 修改后台相关
|
2023-05-31 17:29:24 +08:00 |
perry
|
fe860b399a
|
租户数据权限
|
2023-05-30 10:59:55 +08:00 |
tangqian
|
678da4381a
|
fix: 修改用户(update-user) 取消入参地址验证
|
2023-05-29 20:53:50 +08:00 |
tangqian
|
7709370ca5
|
Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product
# Conflicts:
# yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/controller/app/member/MemberController.java
# yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/service/recharge/RechargeOrderServiceImpl.java
|
2023-05-29 14:59:06 +08:00 |
tangqian
|
80937224e5
|
fix: 商城支付相关
|
2023-05-29 14:56:34 +08:00 |
perry
|
21790ab31d
|
分销数据统计
|
2023-05-29 09:46:14 +08:00 |
perry
|
4aadcef501
|
推广员导出
|
2023-05-28 11:36:55 +08:00 |
perry
|
2d5c8236c7
|
会员管理充值订单数据权限
|
2023-05-27 12:21:55 +08:00 |
perry
|
c5a16c07f9
|
手机验证码登录即注册
|
2023-05-26 17:56:58 +08:00 |
perry
|
e14b6608ef
|
后台报错
|
2023-05-26 13:45:46 +08:00 |
perry
|
8cfba0d856
|
商户id
|
2023-05-26 10:24:35 +08:00 |
tangqian
|
01a1e11f9b
|
fix: 充值相关
|
2023-05-25 11:25:33 +08:00 |
perry
|
b87a5d35a7
|
Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product_new
# Conflicts:
# yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/service/recharge/RechargeOrderServiceImpl.java
|
2023-05-24 16:03:33 +08:00 |
tangqian
|
8a595cbef0
|
fix: 商城相关
|
2023-05-24 15:41:00 +08:00 |
tangqian
|
c82b495ca5
|
fix: 修改判断用户是否被禁用
|
2023-05-24 14:12:43 +08:00 |
perry
|
f1fbbcf36d
|
微信支付
|
2023-05-24 14:10:41 +08:00 |
tangqian
|
3582bdd395
|
fix: 修改判断用户是否被禁用
|
2023-05-24 11:02:32 +08:00 |
tangqian
|
3863a5a1d2
|
fix: 修改app获取用户信息
|
2023-05-23 17:21:26 +08:00 |
perry
|
0e3b3bf667
|
推广员
|
2023-05-23 10:34:09 +08:00 |
perry
|
a6eb645d54
|
订单退款
|
2023-05-22 12:55:07 +08:00 |
perry
|
263ec59f24
|
微信支付
|
2023-05-19 18:25:00 +08:00 |
perry
|
04e0f33ad3
|
微信支付
|
2023-05-19 17:49:39 +08:00 |
tangqian
|
3a209f056b
|
feat: 支付宝相关支付
|
2023-05-19 16:45:37 +08:00 |
perry
|
18909d4c2c
|
微信支付
|
2023-05-18 18:49:43 +08:00 |
perry
|
6fac2affcc
|
测试环境
|
2023-05-18 13:25:44 +08:00 |
perry
|
7870f79674
|
打包
|
2023-05-17 21:50:20 +08:00 |
perry
|
9fbee20579
|
推广员
|
2023-05-17 14:17:20 +08:00 |
perry
|
467c1dd402
|
Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product_new
|
2023-05-17 09:32:22 +08:00 |
perry
|
8798b872e6
|
推广员导入
|
2023-05-17 09:32:13 +08:00 |
tangqian
|
adcb6d26f2
|
Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product
# Conflicts:
# yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/user/MemberUserService.java
|
2023-05-16 18:19:55 +08:00 |
tangqian
|
26a8631927
|
feat: 会员充值,退款
|
2023-05-16 18:19:33 +08:00 |
perry
|
72645b9dfc
|
商户管理
|
2023-05-16 18:17:54 +08:00 |
perry
|
9b9af448fc
|
支付
|
2023-05-16 12:33:49 +08:00 |
perry
|
ca7f62f924
|
支付
|
2023-05-15 23:40:57 +08:00 |
perry
|
e6387b5411
|
Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product_new
|
2023-05-15 14:54:21 +08:00 |
perry
|
7a6b3ab7a2
|
充值记录
|
2023-05-15 14:54:10 +08:00 |
js199000131
|
60102c7bc7
|
用户收件地址字段名称修改
|
2023-05-15 10:26:17 +08:00 |
perry
|
4e350e2767
|
商品管理
|
2023-05-15 09:56:07 +08:00 |
js199000131
|
d624879f22
|
商品和支付
|
2023-05-14 15:44:42 +08:00 |
小小张
|
5254574914
|
Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product
|
2023-05-12 10:20:18 +08:00 |
小小张
|
29e43885c5
|
订单管理--修改
|
2023-05-12 10:19:46 +08:00 |
perry
|
1622984df7
|
商品管理
|
2023-05-11 22:33:51 +08:00 |
perry
|
1a198a5ef0
|
会员管理
|
2023-05-10 15:38:22 +08:00 |
wangzhs
|
38d7d75f7f
|
[新增][商品评价]管理后台/APP端
1. 增加头像返回字段
2. 调整商户自评userId
3. 控制评论图片数量判断
|
2023-03-23 14:06:14 +08:00 |
YunaiV
|
6115a1ee34
|
admin-ui 演示环境,迁移到 https://gitee.com/yudaocode/yudao-ui-static 地址
|
2023-03-05 02:10:16 +08:00 |
YunaiV
|
c3eb9022b8
|
Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/springdoc
# Conflicts:
# yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/config/ConfigController.java
# yudao-module-mall/yudao-module-product-biz/src/test/resources/sql/clean.sql
# yudao-module-mall/yudao-module-product-biz/src/test/resources/sql/create_tables.sql
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/auth/AuthController.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dept/DeptController.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dept/PostController.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/permission/RoleController.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/sms/SmsChannelController.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/UserController.java
# yudao-server/pom.xml
|
2023-02-04 10:21:45 +08:00 |