puhui999
|
d08b9530a2
|
Merge remote-tracking branch 'yudao/feature/mall_product' into feature/mall_product
# Conflicts:
# sql/mysql/optional/mall.sql
|
2023-05-23 11:08:32 +08:00 |
|
puhui999
|
cac5545762
|
fix：完善商品管理, 完善 mall.sql, 完善 product 测试相关sql, 完善 ProductSpuServiceImplTest 测试
|
2023-05-23 11:01:40 +08:00 |
|
jason
|
01a67289a9
|
mall: 订单中心新增运费模板功能
|
2023-05-21 23:35:07 +08:00 |
|
jason
|
3da2eb89b2
|
新增快递公司功能
|
2023-05-18 23:37:56 +08:00 |
|
jason
|
4b643a7b34
|
物流配送管理表结构修改
|
2023-05-15 23:05:39 +08:00 |
|
jason
|
0ffa7ff4c8
|
发货配送模块表结构
|
2023-05-12 19:39:48 +08:00 |
|
jason
|
7345d80b53
|
新增商品收藏功能
|
2023-05-04 15:52:42 +08:00 |
|
puhui999
|
810c7ed040
|
完善商品管理
|
2023-05-04 01:32:25 +08:00 |
|
puhui999
|
992a30486e
|
补充mall.sql
|
2023-04-24 11:09:57 +08:00 |
|
YunaiV
|
8eac97ae12
|
移除 Vue3 专属菜单，统一菜单！
|
2023-04-13 23:38:27 +08:00 |
|
xingyuv
|
70f632852b
|
chore: up hutool 5.8.15
|
2023-04-13 14:51:50 +08:00 |
|
xingyuv
|
760a1d31d5
|
feat: 代码生成 vben
|
2023-04-13 14:43:18 +08:00 |
|
YunaiV
|
d500332a18
|
代码生成，支持配置前端 UI 类型
|
2023-04-13 07:53:41 +08:00 |
|
芋道源码
|
cdaff5c63f
|
!437 补充缺失的6张表对应的6个序列
Merge pull request !437 from libran/N/A
|
2023-03-16 13:09:26 +00:00 |
|
芋道源码
|
12527840e8
|
!435 补充上缺失的6张表
Merge pull request !435 from libran/N/A
|
2023-03-16 13:08:36 +00:00 |
|
libran
|
0218f24b94
|
补充缺失的6张表对应的6个序列
补充缺失的6张表对应的6个序列：
system_mail_account_seq
system_mail_log_seq
system_mail_template_seq
system_notify_message_seq
system_notify_template_seq
system_user_session_seq
Signed-off-by: libran <fang.jian@126.com>
|
2023-03-16 07:58:42 +00:00 |
|
libran
|
b7db210d94
|
update sql/postgresql/ruoyi-vue-pro.sql.
补充system_menu表缺失的两个字段和数据：component_name、always_show
Signed-off-by: libran <fang.jian@126.com>
|
2023-03-16 07:45:20 +00:00 |
|
libran
|
83b0546b7e
|
update sql/postgresql/ruoyi-vue-pro.sql.
补充上缺失的6张表：
system_mail_account
system_mail_log
system_mail_template
system_notify_message
system_notify_template
system_user_session
Signed-off-by: libran <fang.jian@126.com>
|
2023-03-16 07:42:30 +00:00 |
|
owen
|
147091fa08
|
修复积木报表建表语句错误
|
2023-03-08 19:41:46 +08:00 |
|
zheng decan
|
5c6451f6aa
|
fix: PostgreSQL的SQL脚本在非多租户模式下部份表tanant_id默认值缺失造成错误
|
2023-02-12 21:02:10 +08:00 |
|
YunaiV
|
35ba9b36af
|
菜单新增 alwaysShow 总是展示、componentName 组件名
|
2023-02-10 23:03:10 +08:00 |
|
xingyuv
|
fe5f1c74a4
|
fix: router
|
2023-02-09 10:30:48 +08:00 |
|
YunaiV
|
1b6124a0db
|
集成 Go-View 大屏设计器
|
2023-02-07 22:56:33 +08:00 |
|
YunaiV
|
f770133854
|
Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into master_unit-sql
# Conflicts:
# yudao-module-system/yudao-module-system-biz/src/test/resources/sql/clean.sql
|
2023-02-04 10:06:31 +08:00 |
|
xingyu
|
2ea9027031
|
mp user => mp mpuser
|
2023-01-31 13:22:26 +08:00 |
|
xingyu
|
227361661f
|
fix: mp menu error
|
2023-01-31 09:27:27 +08:00 |
|
YunaiV
|
f7762e646e
|
站内信模块：我的站内信 vue3
|
2023-01-29 18:31:52 +08:00 |
|
YunaiV
|
1a4bea8ca2
|
邮箱模块：同步最新的 SQL 脚本
|
2023-01-27 20:58:00 +08:00 |
|
YunaiV
|
3166cd7063
|
mp：同步 mp 公众号 SQL
|
2023-01-17 23:56:27 +08:00 |
|
芋道源码
|
9e40134355
|
!357 积木报表分享报错
Merge pull request !357 from 与或非/issues/I64GXA
|
2023-01-07 01:34:56 +00:00 |
|
gaibu
|
04287fa9d8
|
fix: 积木报表分享报错
|
2023-01-06 17:02:48 +08:00 |
|
xingyu
|
6a9244a707
|
feat: vue3 add websocket
|
2023-01-05 11:10:31 +08:00 |
|
咱哥丶
|
7879632cf5
|
commit 增加webSocket 菜单sql
|
2023-01-02 23:13:50 +08:00 |
|
dengxiaobing
|
df2c137fe2
|
清理单元测试 sql 脚本
|
2022-12-30 10:10:43 +08:00 |
|
xingyu
|
17d9a4e4f2
|
perf: 优化数据库建表语句
|
2022-12-20 09:10:44 +08:00 |
|
xingyu
|
46c93b637f
|
chore: update deps
|
2022-12-19 10:51:36 +08:00 |
|
gaibu
|
67435648b2
|
fix: 逻辑删除唯一索引冲突的问题
|
2022-12-10 11:32:46 +08:00 |
|
YunaiV
|
ea95115ffd
|
移除云片短信渠道，解决云片的安全风险
|
2022-11-25 20:22:04 +08:00 |
|
YunaiV
|
afc76973ce
|
Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/1.8.0-uniapp
# Conflicts:
# yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/util/date/DateUtils.java
# yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/controller/admin/coupon/vo/CouponBaseVO.java
# yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/controller/admin/coupon/vo/CouponExcelVO.java
# yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/controller/admin/coupon/vo/CouponExportReqVO.java
# yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/controller/admin/coupon/vo/CouponPageReqVO.java
# yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/controller/admin/coupon/vo/CouponRespVO.java
# yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/controller/admin/templete/vo/CouponTempleteBaseVO.java
# yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/controller/admin/templete/vo/CouponTempleteExcelVO.java
# yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/controller/admin/templete/vo/CouponTempleteExportReqVO.java
# yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/controller/admin/templete/vo/CouponTempletePageReqVO.java
# yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/controller/admin/templete/vo/CouponTempleteRespVO.java
# yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/dal/dataobject/CouponTemplete/CouponTempleteDO.java
# yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/dal/dataobject/coupon/CouponDO.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/spu/vo/ProductSpuPageReqVO.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/spu/vo/ProductSpuRespVO.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/dal/dataobject/discount/DiscountProductDO.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/dal/dataobject/reward/RewardActivityDO.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/order/AppTradeOrderController.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/dataobject/cart/TradeCartItemDO.java
# yudao-module-member/yudao-module-member-api/src/main/java/cn/iocoder/yudao/module/member/api/user/dto/UserInfoDTO.java
# yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/user/MemberUserServiceImpl.java
# yudao-server/pom.xml
# yudao-server/src/main/resources/application-local.yaml
# yudao-server/src/main/resources/application.yaml
# yudao-ui-admin/src/views/mall/CouponTemplete/index.vue
# yudao-ui-admin/src/views/mall/product/property/index.vue
# yudao-ui-admin/src/views/mall/product/spu/index.vue
# yudao-ui-admin/src/views/mall/product/spu/save.vue
# yudao-ui-admin/src/views/system/role/index.vue
|
2022-11-13 12:07:59 +08:00 |
|
芋道源码
|
ae0227c107
|
!276 阿里云OSS解析region时兼容带https的配置
Merge pull request !276 from huangyemin/master
|
2022-11-12 02:23:25 +00:00 |
|
YunaiV
|
c51ab6ad73
|
优化 Vue3 SQL 导入脚本，避免误解
|
2022-11-11 09:09:25 +08:00 |
|
xingyu4j
|
2e2cd448bd
|
chore: update devs
|
2022-11-01 10:04:15 +08:00 |
|
luowenfeng
|
aea763e96e
|
feature(单元测试): ProductSpuServiceImpl单元测试
|
2022-10-22 17:51:26 +08:00 |
|
huangyemin
|
eb48817f7b
|
sql脚本中banner菜单配置错误修改
|
2022-10-12 15:42:45 +08:00 |
|
huangyemin
|
29d302a901
|
sql脚本执行报错问题修改
|
2022-10-12 15:28:00 +08:00 |
|
ex_yang.li@ca-nio.com
|
f21ce954ec
|
Merge remote-tracking branch 'origin/feature/1.8.0-uniapp' into ly_uniapp
# Conflicts:
# yudao-module-mall/yudao-module-market-biz/src/main/java/cn/iocoder/yudao/module/market/api/price/PriceApiImpl.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/api/sku/ProductSkuApiImpl.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/api/spu/ProductSpuApiImpl.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/convert/sku/ProductSkuConvert.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/mysql/sku/ProductSkuMapper.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/convert/order/TradeOrderConvert.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/convert/order/TradeOrderItemConvert.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/order/TradeOrderServiceImpl.java
# yudao-server/src/main/resources/application.yaml
|
2022-09-15 17:09:17 +08:00 |
|
ex_yang.li@ca-nio.com
|
5889093a64
|
创建交易订单-单元测试
|
2022-09-15 16:57:04 +08:00 |
|
芋道源码
|
61b0624a59
|
!262 接口实现-交易订单创建(未完全实现)
Merge pull request !262 from LeeYan9/ly_uniapp
|
2022-09-05 13:16:11 +00:00 |
|
ex_yang.li@ca-nio.com
|
7bf20ec72e
|
创建订单接口定义
|
2022-09-05 20:44:04 +08:00 |
|
YunaiV
|
9632c33d27
|
mall：优化商品的分类、品牌的代码
|
2022-09-05 20:03:13 +08:00 |
|