jason
|
1ffbd9399e
|
新增获得支付钱包接口
|
2023-08-25 22:08:40 +08:00 |
|
YunaiV
|
9b6f5bd503
|
code review:会员等级
|
2023-08-24 00:53:09 +08:00 |
|
owen
|
da8b2eab6d
|
合并冲突
|
2023-08-23 10:24:01 +08:00 |
|
owen
|
4dd2d80887
|
Merge remote-tracking branch 'origin/feature/mall_product' into member_dev
# Conflicts:
# sql/mysql/member_level.sql
# yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/level/MemberExperienceLogService.java
# yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/level/MemberLevelLogService.java
# yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/level/MemberLevelLogServiceImpl.java
|
2023-08-23 10:17:24 +08:00 |
|
YunaiV
|
54bf24b966
|
code review:会员等级
|
2023-08-22 21:59:00 +08:00 |
|
owen
|
ca51056c00
|
会员: 统一用户等级记录、用户经验记录 命名
|
2023-08-22 20:49:25 +08:00 |
|
owen
|
bdb38c4157
|
会员: 修改会员等级,使用单独的表单、接口
|
2023-08-22 11:23:09 +08:00 |
|
owen
|
9d9638b15b
|
Merge remote-tracking branch 'origin/feature/mall_product' into member_dev
# Conflicts:
# yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/user/MemberUserController.java
# yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/convert/user/MemberUserConvert.java
|
2023-08-22 00:47:45 +08:00 |
|
owen
|
8ae3401452
|
会员: 增加会员分组功能
|
2023-08-22 00:43:36 +08:00 |
|
芋道源码
|
4cd5b5712b
|
!577 会员:修改会员标签名称唯一校验逻辑
Merge pull request !577 from 疯狂的世界/member_dev
|
2023-08-21 14:51:19 +00:00 |
|
owen
|
8ffbc15cec
|
会员:后台调整会员等级
|
2023-08-21 21:31:16 +08:00 |
|
owen
|
f884054d2c
|
会员:完善会员等级校验、单元测试
|
2023-08-21 00:23:45 +08:00 |
|
YunaiV
|
c3e4e23459
|
同步最新 Member 菜单
|
2023-08-20 20:01:18 +08:00 |
|
YunaiV
|
a83c156bf1
|
code review:签到记录
|
2023-08-20 19:34:28 +08:00 |
|
YunaiV
|
c5e85f3bfb
|
code review:签到配置
|
2023-08-20 19:26:31 +08:00 |
|
YunaiV
|
4257cad46a
|
code review:会员积分
|
2023-08-20 19:06:23 +08:00 |
|
owen
|
e2032e7e97
|
会员:增加会员等级增删改查
|
2023-08-20 15:54:06 +08:00 |
|
xiaqing
|
2e9dfac9ab
|
会员积分和会员签到模块todo修改
|
2023-08-19 14:09:22 +08:00 |
|
decan
|
e6f4d649aa
|
fix: postgres sql
|
2023-08-14 01:32:46 +08:00 |
|
芋道源码
|
4177071758
|
!560 todo修改
Merge pull request !560 from QingX/feature/mall_product
|
2023-08-11 14:44:52 +00:00 |
|
天天写BUG
|
f221f58973
|
update sql/postgresql/ruoyi-vue-pro.sql.
fix:修复创建新租户,由于data_scope_dept_ids设置的是 not null 但是是空值时候产生错误,插入失败
Signed-off-by: 天天写BUG <decan_zheng@foxmail.com>
|
2023-08-09 15:29:09 +00:00 |
|
xiaqing
|
93effe8fa7
|
新版表结构
|
2023-08-09 22:43:14 +08:00 |
|
congqing
|
1dee258c18
|
适配postgres数据库sql脚本
infra_codegen_table表增加front_type字段
member_user表部分字段增加默认值
system_menu表permission增加默认值
|
2023-07-26 01:22:42 +08:00 |
|
YunaiV
|
00e1c30f57
|
1. 修复创建支付应用,界面会报错的问题
2. 同步最新 SQL 文件
|
2023-07-24 12:51:14 +08:00 |
|
YunaiV
|
2485a5ebc9
|
mall + pay:
1. 将 amount 统一都修改成 price
2. 将 payed 统一改成 payStatus
|
2023-07-10 17:35:26 +08:00 |
|
YunaiV
|
5d2d52020e
|
mall + pay:简化 pay 的复杂度
1. 移除 merchant 表设计
2. 移除 app 和 channel 的导出
|
2023-07-09 12:40:26 +08:00 |
|
YunaiV
|
23e3c4d0d9
|
Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/mall_product
|
2023-07-02 23:45:48 +08:00 |
|
芋道源码
|
2f42964a96
|
!524 会员中心合并至member 模块
Merge pull request !524 from QingX/feature/mall_product
|
2023-07-02 13:51:00 +00:00 |
|
jason
|
3a1e5c1b5f
|
pay : 会员电子钱包表结构
|
2023-06-30 10:24:36 +08:00 |
|
xiaqing
|
c7ced55a6c
|
会员中心代码、sql脚本提交
1.合并积分模块只member module
2.初始化sql放入mysql/member_point.sql
3.添加会员中/会员积分、会员签到/xxx层级目录
4.删除无用的接口代码
|
2023-06-28 22:49:19 +08:00 |
|
jason
|
050f0bb6a2
|
页面装修 review 修改
|
2023-06-24 21:09:49 +08:00 |
|
jason
|
ad1f656dfa
|
页面装修修改,后端只负责存取
|
2023-06-24 00:11:04 +08:00 |
|
芋道源码
|
b16632ea41
|
!522 mall seckill
Merge pull request !522 from puhui999/feature/mall_product
|
2023-06-23 06:04:47 +00:00 |
|
jason
|
6b1d996b66
|
页面装修数据结构定义
|
2023-06-23 10:53:29 +08:00 |
|
puhui999
|
16f2a5b91a
|
Merge remote-tracking branch 'yudao/feature/mall_product' into feature/mall_product
|
2023-06-17 21:19:02 +08:00 |
|
puhui999
|
32cca12cd2
|
fix:seckillTime => seckillConfig
|
2023-06-17 21:17:02 +08:00 |
|
芋道源码
|
798e322f08
|
!506 积分模块
Merge pull request !506 from QingX/feature/mall_product
|
2023-06-17 09:41:41 +00:00 |
|
芋道源码
|
74aebfca3e
|
Merge pull request #292 from aboutZZ/fix
修复PG数据库部分字典数据缺失;修复PG数据库因字段无默认值无法直接运行生成的SQL
|
2023-06-17 14:03:27 +08:00 |
|
YunaiV
|
1f4f8c0747
|
Merge branch 'dev-fix-sql4pg' of https://gitee.com/congqinggit/ruoyi-vue-pro
Conflicts:
sql/postgresql/ruoyi-vue-pro.sql
|
2023-06-17 12:45:31 +08:00 |
|
Zhe
|
ae8397422a
|
修复PG数据库部分字典数据缺失;修复因字段无默认值无法直接运行生成SQL问题
|
2023-06-14 16:16:56 +08:00 |
|
xingyu
|
573ad59edc
|
Merge remote-tracking branch 'origin/master' into feature/mall_product
# Conflicts:
# yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/util/string/StrUtils.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/brand/vo/ProductBrandBaseVO.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/category/vo/ProductCategoryBaseVO.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/sku/vo/ProductSkuBaseVO.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/spu/vo/ProductSpuBaseVO.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-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/spu/vo/ProductSpuSimpleRespVO.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/app/spu/vo/AppProductSpuDetailRespVO.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/app/spu/vo/AppProductSpuPageItemRespVO.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/order/vo/TradeOrderBaseVO.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/order/vo/TradeOrderItemBaseVO.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/base/sku/AppProductSkuBaseRespVO.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/cart/vo/AppTradeCartDetailRespVO.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/cart/vo/AppTradeCartItemUpdateSelectedReqVO.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/cart/vo/AppTradeCartResetReqVO.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/order/vo/AppTradeOrderCreateReqVO.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/order/vo/AppTradeOrderDetailRespVO.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/order/vo/AppTradeOrderGetCreateInfoRespVO.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/order/vo/AppTradeOrderPageItemRespVO.java
# yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/address/vo/AppAddressBaseVO.java
|
2023-06-14 15:18:12 +08:00 |
|
xiaqing
|
5f64fe052b
|
初始化sql
|
2023-06-10 20:45:31 +08:00 |
|
呵呵大
|
143bff909a
|
修复使用PG数据库时,站内信表、菜单权限表字段类型不一致问题
在`NotifyMessageDO`实体类中`read_status`是布尔类型,因此数据库中也要定义为 `bool` 类型,否则查询报错。菜单权限表`system_menu`表同理。
|
2023-06-10 03:57:47 +00:00 |
|
御码滴汉子
|
87d4f9b71a
|
将菜单表中的短信预置路径更改为最新路径
Signed-off-by: 御码滴汉子 <1024@cong.zone>
|
2023-06-04 15:57:02 +00:00 |
|
御码滴汉子
|
9af0aa5f7d
|
pg数据库脚本system_menu表always_show字段类型错误导致菜单编辑保存失败
Signed-off-by: 御码滴汉子 <1024@cong.zone>
|
2023-06-04 15:51:19 +00:00 |
|
御码滴汉子
|
87670265b2
|
update sql/postgresql/ruoyi-vue-pro.sql.
read_status 类型修改为bool
Signed-off-by: 御码滴汉子 <1024@cong.zone>
|
2023-06-04 15:15:19 +00:00 |
|
jason
|
894b19b8ec
|
新增自提门店管理
|
2023-05-30 21:18:30 +08:00 |
|
jason
|
55dbff7570
|
运费模板 review 修改. 运费模块可以选择多个区域
|
2023-05-27 11:20:43 +08:00 |
|
YunaiV
|
53e9be733f
|
mall:review + mall:快递公司管理
|
2023-05-24 23:40:55 +08:00 |
|
puhui999
|
a70c7ca855
|
fix:完善 mall.sql
|
2023-05-23 11:59:48 +08:00 |
|
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 |
|
LiuZijian
|
6ac96facf6
|
新增:达梦数据库dm8 sql文件
|
2023-05-09 10:10:13 +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 |
|
YunaiV
|
833fd33844
|
Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/1.8.0-uniapp
Conflicts:
sql/optional/mall/mall.sql
|
2022-09-04 21:06:28 +08:00 |
|
ex_yang.li@ca-nio.com
|
19a703b8c9
|
创建订单接口定义
|
2022-08-26 17:47:43 +08:00 |
|
luowenfeng
|
4a39f2d9f8
|
feature(uniapp商品): 代码调整
|
2022-08-25 17:10:26 +08:00 |
|
luowenfeng
|
617573a59b
|
feature(uniapp分类): 商品创建功能以及查询功能正常使用
|
2022-08-22 20:43:12 +08:00 |
|
xingyu
|
020535ab3a
|
Merge branch 'master' of gitee.com:zhijiantianya/ruoyi-vue-pro into master
Signed-off-by: xingyu <xingyu4j@vip.qq.com>
|
2022-08-22 00:57:43 +00:00 |
|
ycak47
|
c53034a2dc
|
首次导入sql报错的问题。
1.积木报表菜单重复
2.Banner管理SQL注释错误及主键重复
|
2022-08-16 16:03:28 +08:00 |
|
xingyu
|
a6a01fcb8e
|
增加升级sql文件说明
|
2022-08-11 11:55:26 +08:00 |
|
xingyu
|
5f6926d17c
|
增加升级sql文件
|
2022-08-11 11:54:07 +08:00 |
|
wuxiran
|
d2a9a49dad
|
mall:更新优惠券模板sql文件
|
2022-08-09 19:47:59 +08:00 |
|
wuxiran
|
f0ee6467b3
|
mall:提交优惠券sql文件
|
2022-08-09 11:50:46 +08:00 |
|
YunaiV
|
75d2b9a19e
|
mall:同步最新 SQL
|
2022-08-01 23:02:14 +08:00 |
|
xingyu
|
58cdc0be13
|
fix: fix menu active bug
|
2022-08-01 09:58:19 +08:00 |
|
xingyu
|
340790dec4
|
chore: update deps
|
2022-08-01 09:47:11 +08:00 |
|
YunaiV
|
2340f09c68
|
mall:调整部分 SPU、SKU 的表设计
|
2022-07-31 02:19:18 +08:00 |
|
YunaiV
|
fa9823161e
|
mall:完善商品品牌的前后端实现
|
2022-07-30 22:15:03 +08:00 |
|
YunaiV
|
969c387764
|
mall:完善商品分类的管理后台界面
|
2022-07-30 20:28:01 +08:00 |
|
芋道源码
|
35413b52c9
|
!237 集成积木报表
Merge pull request !237 from 芋道源码/feature/visual
|
2022-07-29 04:51:54 +00:00 |
|
YunaiV
|
74c9e68a0f
|
1. 修改 file 的 type 过短的问题
2. 修复 pgsql 脚本不正确的问题
|
2022-07-29 00:38:47 +08:00 |
|
YunaiV
|
d872676748
|
完善积木报表的集成
|
2022-07-28 09:29:51 +08:00 |
|
YunaiV
|
40520b6c88
|
fix:降级 fastjson 版本,解决新版本的 jimu 报表在 2.0.10 会报错的问题
|
2022-07-28 00:58:24 +08:00 |
|
YunaiV
|
b2f5900abc
|
Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/visual
|
2022-07-27 22:45:40 +08:00 |
|
芋道源码
|
69a7b0de57
|
!220 vue3
Merge pull request !220 from xingyu/master
|
2022-07-20 12:19:35 +00:00 |
|
xingyu
|
87f4248e2f
|
fix: Vue Router i18 warn
|
2022-07-20 15:12:59 +08:00 |
|
xingyu
|
74983d7b74
|
feat: vue3 menu sql
|
2022-07-20 14:56:08 +08:00 |
|
YunaiV
|
b0cdfd7afc
|
完善工作流的注释
|
2022-07-20 00:34:44 +08:00 |
|
jiangqiang
|
5c58a377db
|
新增积木报表菜单
|
2022-07-10 20:43:21 +08:00 |
|
jiangqiang
|
653520d85b
|
积木报表SQL脚本,拦截配置,以及组件扫描包配置
|
2022-07-10 18:08:26 +08:00 |
|
jiangqiang
|
dd726f7985
|
中英文之间加空格
|
2022-07-09 17:11:39 +08:00 |
|
jiangqiang
|
0ed3321719
|
修改文件表表结构
|
2022-07-08 08:44:09 +08:00 |
|
jiangqiang
|
36d7775171
|
1. 修改文件名和文件路径字段长度一致,因为如果不存在文件名的情况下,会使用文件路径作为字段名,防止数据库报错字段内容太长。
2. 修改type字段为ext_name,因为此字段本来就存的文件扩展名,并且新增mime_type字段,用来存储文件的类型。方便后期拓展网盘项目。
3. 修改文件路径生成方式:之前是md5,现在是sha256,降低文件碰撞概率。方便拓展网盘项目,实现秒传等功能。
|
2022-07-07 09:43:59 +08:00 |
|
YunaiV
|
b69b74b770
|
Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/1.8.0-uniapp
Conflicts:
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/auth/MemberAuthServiceImpl.java
|
2022-07-04 19:56:54 +08:00 |
|
YunaiV
|
d3fe187696
|
增加 file 的文件名的字段,同步最新 SQL
|
2022-06-15 08:24:06 +08:00 |
|
xiaxiaoYY
|
247d299cca
|
Banner模块 for review
|
2022-05-31 16:08:10 +08:00 |
|
YunaiV
|
72019f727e
|
Merge remote-tracking branch 'origin/feature/1.8.0-uniapp' into feature/1.8.0-uniapp
|
2022-05-29 11:07:06 +08:00 |
|
YunaiV
|
bb26bc4012
|
Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/1.8.0-uniapp
Conflicts:
yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/file/FileController.java
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/user/UserController.java
yudao-ui-admin/src/components/ImageUpload/index.vue
|
2022-05-29 11:05:33 +08:00 |
|
YunaiV
|
2105950321
|
同步 SSO 相关的 Oracle、PostgreSQL 的脚本
|
2022-05-26 01:03:57 +08:00 |
|
YunaiV
|
6566605da3
|
同步 SSO 相关的 MySQL、SQL Server 的脚本
|
2022-05-26 00:13:06 +08:00 |
|
shuaidawang
|
204a5ba284
|
规格增删改查接口及页面提交
|
2022-05-19 17:25:28 +08:00 |
|
shuaidawang
|
bd944c4a8b
|
商品规格和spu前端代码生成
|
2022-05-18 17:12:03 +08:00 |
|
shuaidawang
|
0b087c84c6
|
规格和商品菜单提交
|
2022-05-18 16:53:55 +08:00 |
|
franky
|
2bbfa40265
|
调整商品代码生成模块
|
2022-05-17 22:16:48 +08:00 |
|
franky
|
657e4d035b
|
spu,sku表结构同步
|
2022-05-17 21:18:56 +08:00 |
|
YunaiV
|
1f1970e6c8
|
提供最新的内嵌模式
|
2022-05-17 09:55:21 +08:00 |
|
YunaiV
|
09c8a91b6a
|
修复 MySQL 文件的编码错误
|
2022-05-13 19:24:07 +08:00 |
|
YunaiV
|
db0fbcf3d9
|
同步最新的 MySQL、Oracle、PostgreSQL、SQLServer 的数据文件
|
2022-05-13 12:31:06 +08:00 |
|
YunaiV
|
e1daeba5d3
|
同步最新的 SQL 脚本
|
2022-05-13 01:52:10 +08:00 |
|
jeromesoar
|
ff307a4c86
|
fix: TODO pid 改成 parentId 字段
|
2022-05-12 16:57:33 +08:00 |
|
YunaiV
|
a233ab1395
|
Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/1.8.0-uniapp
Conflicts:
sql/ruoyi-vue-pro.sql
yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue/views/index.vue.vm
|
2022-05-04 23:44:11 +08:00 |
|
YunaiV
|
60f918da84
|
增加 SQLServer 的适配~
|
2022-05-02 18:04:34 +08:00 |
|
YunaiV
|
c845f3f012
|
Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/1.6.2-postgresql
|
2022-05-02 15:24:24 +08:00 |
|
YunaiV
|
8606f5c605
|
优化 UserSession 的实现,将 id 变成自增,额外增加 token 字段
|
2022-05-02 12:33:37 +08:00 |
|
anzhen
|
18a3f4d3eb
|
Merge branch 'upstream/master'
# Conflicts:
# sql/ruoyi-vue-pro.sql
|
2022-05-02 11:50:35 +08:00 |
|
YunaiV
|
0f21b55e6d
|
解决 Oracle 关键字冲突的问题
导出最新的 SQL 脚本
|
2022-05-01 23:18:50 +08:00 |
|
YunaiV
|
7db1a58bfc
|
适配 Oracle 数据库
1. 去除关键字,避免数据库的查询冲突
|
2022-05-01 13:33:02 +08:00 |
|
YunaiV
|
72ad12344b
|
调整 Flowable、Activiti 提供的脚本,通过 db 自动生成
|
2022-04-30 23:26:43 +08:00 |
|
YunaiV
|
adfe2926da
|
1. 同步 MySQL、PostgreSQL 最新的脚本
2. 修复单元测试的报错
|
2022-04-30 23:16:24 +08:00 |
|
YunaiV
|
45cbb56ea1
|
1. 同步 MySQL、PostgreSQL 最新的脚本
2. 修复单元测试的报错
|
2022-04-30 23:11:37 +08:00 |
|
YunaiV
|
30e886be6f
|
解决 PostgreSQL 集成 Quartz 时的报错
|
2022-04-30 22:52:55 +08:00 |
|
YunaiV
|
2367280d83
|
1. 同步最新 SQL
2. 生成内嵌的页面
|
2022-04-30 00:06:49 +08:00 |
|
shuaidawang
|
14a1d70cbb
|
【促销活动】-代码生成
|
2022-04-28 16:18:57 +08:00 |
|
YunaiV
|
d04271b965
|
增加数据源管理 SQL
|
2022-04-27 23:26:03 +08:00 |
|
anzhen
|
1cd4338857
|
Merge branch 'upstream/master'
# Conflicts:
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/dept/UserPostDO.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/dept/UserPostMapper.java
|
2022-04-27 22:17:43 +08:00 |
|
YunaiV
|
2d797ef3e8
|
同步最新社交登录的 SQL 脚本
|
2022-04-27 01:53:26 +08:00 |
|
JeromeSoar
|
cc6c3d2759
|
品牌代码生成
|
2022-04-25 16:11:30 +08:00 |
|
JeromeSoar
|
d3edaec2b1
|
商品分类维护
|
2022-04-24 17:01:10 +08:00 |
|
JeromeSoar
|
4e67b6bbcf
|
商品分类代码生成
|
2022-04-24 14:42:51 +08:00 |
|
YunaiV
|
3a0feef402
|
Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/1.8.0-uniapp
Conflicts:
sql/ruoyi-vue-pro.sql
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/address/AppAddressController.http
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/address/AppAddressController.java
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/address/package-info.java
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/address/vo/AppAddressBaseVO.java
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/address/vo/AppAddressCreateReqVO.java
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/address/vo/AppAddressRespVO.java
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/address/vo/AppAddressUpdateReqVO.java
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/convert/address/AddressConvert.java
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/dataobject/address/AddressDO.java
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/dataobject/address/package-info.java
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/mysql/address/AddressMapper.java
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/enums/AddressTypeEnum.java
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/address/AddressService.java
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/address/AddressServiceImpl.java
yudao-module-member/yudao-module-member-biz/src/test/java/cn/iocoder/yudao/module/member/service/address/AddressServiceImplTest.java
|
2022-04-22 20:18:50 +08:00 |
|
YunaiV
|
c703628940
|
【新增】菜单新增是否缓存、是否隐藏的字段
|
2022-04-21 01:47:34 +08:00 |
|
anzhen
|
17167c24d1
|
code review 编码规范统一
|
2022-04-15 15:56:47 +08:00 |
|
shuaidawang
|
57ea98b508
|
用户收件地址sql
|
2022-04-14 15:49:57 +08:00 |
|
YunaiV
|
2d5601be92
|
调整前端和环境的环境配置
|
2022-04-13 12:24:08 +08:00 |
|
YunaiV
|
076c7a4e3e
|
优化短信模块的代码
|
2022-04-11 01:21:33 +08:00 |
|
YunaiV
|
65a86e8d75
|
Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/1.6.2-qcloud
Conflicts:
yudao-ui-admin/yarn.lock
|
2022-04-09 11:27:47 +08:00 |
|
YunaiV
|
9d9836dea2
|
完善敏感词的单元测试
|
2022-04-09 11:18:07 +08:00 |
|
FinallySays
|
6fd52dfbb6
|
接入腾讯云短信
|
2022-04-04 17:30:58 +08:00 |
|
安贞
|
3cd135850e
|
新建一个关联表维护用户岗位关系
|
2022-03-30 17:21:24 +08:00 |
|
YunaiV
|
315be160a8
|
同步最新 SQL,准备发布 1.6.1 版本
|
2022-03-20 02:32:18 +08:00 |
|
YunaiV
|
d23232aab0
|
完成新 File 的功能
|
2022-03-17 00:02:57 +08:00 |
|
YunaiV
|
5a2169b688
|
将 tool 合并到 infra 模块
|
2022-03-11 00:39:34 +08:00 |
|
HFwas
|
500f0a72ce
|
fix://修复导入数据报错
|
2022-03-07 23:59:21 +08:00 |
|
YunaiV
|
120cbc9123
|
修改版本号为 1.6.0,准备 Flowable 工作流发版!
|
2022-03-06 15:04:53 +08:00 |
|
YunaiV
|
d2636a7787
|
调整 DataScopeEnum 到 yudao-module-system-api 包下,合理~
|
2022-03-03 13:12:52 +08:00 |
|
YunaiV
|
3201288036
|
review flowable 的代码实现,测试通过
|
2022-02-28 00:58:11 +08:00 |
|
YunaiV
|
bf37095259
|
v.1.5.1 发布,优化多租户功能,支持自动创建用户、角色等信息
|
2022-02-27 16:31:56 +08:00 |
|
YunaiV
|
ec8b356ba6
|
v.1.5.1 发布,优化多租户功能,支持自动创建用户、角色等信息
|
2022-02-27 13:40:10 +08:00 |
|
YunaiV
|
f63d4e20b9
|
同步最新版本的 SQL 脚本
|
2022-02-27 02:43:25 +08:00 |
|
YunaiV
|
121fd0652d
|
1.5.0 版本准备发布,同步最新的 SQL
|
2022-02-17 20:18:40 +08:00 |
|
YunaiV
|
78fe38d687
|
v3.6.0 完成~
|
2022-02-16 22:05:13 +08:00 |
|
YunaiV
|
d649b93017
|
1. 同步最新的 SQL
2. 修复多租户的定时 Task 无法获取租户编号的问题
|
2022-02-05 00:54:31 +08:00 |
|
YunaiV
|
8d59384904
|
多模块重构 10:去除 Freemarker 依赖,修改字典的前缀,从 sys=》system、inf=》infra 见名知意
|
2022-02-02 01:27:04 +08:00 |
|
YunaiV
|
0f2031d0db
|
更新 Pay 相关的 README.md
|
2022-01-23 13:43:14 +08:00 |
|
YunaiV
|
2860108a7d
|
Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into pay_extension
Conflicts:
sql/ruoyi-vue-pro.sql
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/system/enums/SysDictTypeConstants.java
yudao-admin-server/src/main/resources/application-local.yaml
yudao-admin-server/src/main/resources/application.yaml
yudao-admin-server/src/test/resources/sql/clean.sql
yudao-admin-server/src/test/resources/sql/create_tables.sql
yudao-admin-ui/src/utils/dict.js
|
2022-01-23 04:12:34 +08:00 |
|
YunaiV
|
e487e31961
|
同步最新的 SQL
|
2022-01-23 01:43:35 +08:00 |
|
YunaiV
|
e01b33bc78
|
同步最新的表结构
|
2022-01-15 13:07:19 +08:00 |
|
YunaiV
|
9734eacf01
|
完成 bpm 已办任务列表
|
2022-01-09 22:47:18 +08:00 |
|
jason
|
5bf3045544
|
优化退款逻辑
|
2022-01-03 22:32:39 +08:00 |
|
YunaiV
|
c4003396a5
|
1. 同步最新的 SQL
2. 同步最新的配置到 dev 文件
|
2022-01-02 19:31:36 +08:00 |
|
YunaiV
|
c84a9dd67e
|
优化流程 Model 的部署代码
|
2022-01-01 22:03:17 +08:00 |
|
YunaiV
|
ff7b9d9d26
|
增加 Bpm Field 的 vModel 重复的问题
|
2021-12-31 23:19:11 +08:00 |
|
jason
|
08103685f1
|
重构退款逻辑,去掉退款后处理
|
2021-12-28 17:10:25 +08:00 |
|
YunaiV
|
d49ce4c81f
|
同步最新 SQL
|
2021-12-25 19:32:59 +08:00 |
|
YunaiV
|
4b5c185608
|
code review 支付商户逻辑
|
2021-12-25 17:53:18 +08:00 |
|
chen quan
|
aad85337ce
|
Merge remote-tracking branch 'origin/pay_extension' into pay_extension
# Conflicts:
# yudao-admin-server/src/test/resources/sql/create_tables.sql
|
2021-12-21 17:02:15 +08:00 |
|
chen quan
|
d1a20bf259
|
1、完成代付订单后台模块
2、将pay模块的 PayRefundMapper 更名为 PayRefundCoreMapper 避免冲突
3、将支付订单 UI 界面进行调整优化
|
2021-12-21 16:55:58 +08:00 |
|
YunaiV
|
c916b30fa1
|
Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into pay_extension
Conflicts:
sql/ruoyi-vue-pro.sql
yudao-admin-server/src/main/resources/application.yaml
yudao-admin-server/src/test/resources/sql/clean.sql
yudao-admin-server/src/test/resources/sql/create_tables.sql
yudao-admin-ui/src/utils/dict.js
yudao-user-server/src/main/resources/application-local.yaml
|
2021-12-16 09:45:50 +08:00 |
|
YunaiV
|
abf61bfdea
|
修复引入多租户后,前端 <img /> 读取图片报错的问题
|
2021-12-15 13:08:15 +08:00 |
|
YunaiV
|
72dc28a639
|
同步最新的 SQL 脚本
|
2021-12-14 23:04:36 +08:00 |
|
chen quan
|
98dfa48ced
|
1:优化商户管理页面BUG
2:优化应用关闭页面
3:完成支付订单CURD 以及单元测试
4:将 Element UI 从 2.15.0 升级至 2.15.6
|
2021-12-08 19:21:24 +08:00 |
|
aquan
|
6069a387ea
|
优化完善支付应用和支付渠道代码逻辑,完善单元测试,基于validator完成手动校验config
|
2021-11-21 19:37:16 +08:00 |
|
jason
|
7d6f205dc0
|
支付退款申请,支付宝手机wap 相应实现
|
2021-11-21 11:12:32 +08:00 |
|
aquan
|
e46a27b937
|
完成支付模块支付应用信息和微信类型的支付渠道配置。
|
2021-11-09 16:36:07 +08:00 |
|
ouyang
|
87d8b55b41
|
Merge branch 'pay_extension' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into pay_extension
|
2021-11-04 14:32:42 +08:00 |
|
ouyang
|
461c6a0007
|
tina提交支付宝扫码支付
|
2021-11-04 14:27:36 +08:00 |
|
aquan
|
38f1d6428f
|
Merge remote-tracking branch 'origin/pay_extension' into pay_extension
|
2021-11-04 09:35:56 +08:00 |
|
jason
|
a1105ffdc7
|
调整表 pay_order_extension,字段 channel_notify_data,长度
|
2021-11-04 00:46:27 +08:00 |
|
aquan
|
1a721ceb5f
|
完成支付模块的商户管理开发以及单元测试
|
2021-11-03 19:14:44 +08:00 |
|
YunaiV
|
742125ed99
|
code review 工作流的代码
合并最新的 SQL
|
2021-10-30 13:46:39 +08:00 |
|
YunaiV
|
31c4a52858
|
Merge branch 'feature/activiti' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/activiti
|
2021-10-30 11:07:13 +08:00 |
|
YunaiV
|
0050b1e46d
|
Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/activiti
Conflicts:
yudao-dependencies/pom.xml
yudao-framework/pom.xml
|
2021-10-30 10:24:58 +08:00 |
|
YunaiV
|
0e209d9cfc
|
同步最新的表结构
|
2021-10-29 08:22:13 +08:00 |
|
jason
|
d16185f87d
|
修改表单为外置表单
|
2021-10-28 00:51:57 +08:00 |
|
YunaiV
|
72b64dc526
|
同步最新的支付表结构
|
2021-10-26 09:53:17 +08:00 |
|
jason
|
436781507e
|
merge master change
|
2021-10-23 19:16:00 +08:00 |
|
YunaiV
|
6dc65234ef
|
增加支付相关表的 SQL,调整相关的实体
|
2021-10-23 17:47:27 +08:00 |
|
jason
|
ee8dcd0888
|
1.实现了工作流引擎 中 请假流程demo(定义在 resources/leave.bpmn)
2.增加一个一级菜单 OA 办公 下面两个菜单: 请假申请,待办任务
3.暂时不知如何找部门领导, 暂时写死为 admin
4.activity 用户组使用 用户岗位来代替。
5.新增一个用户 hradmin, 密码 123456 岗位是 人力资源
6.演示流程。
a. admin 登陆 申请请假
b. admin 待办任务(审批)
c. hradmin 登陆 待办任务(审批)
d. admin 登陆 待办任务 (确认)
|
2021-10-13 23:43:03 +08:00 |
|
YunaiV
|
5133cd0fdf
|
Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into pay_extension
|
2021-10-12 21:25:03 +08:00 |
|
YunaiV
|
4909342d7e
|
同步最新的 SQL 脚本
|
2021-10-12 21:22:22 +08:00 |
|
QingChen
|
0effbc513c
|
支付表结构
|
2021-10-12 14:57:40 +08:00 |
|
wangwenbin10
|
b139107717
|
初始化 c 端的用户相关的表
|
2021-10-08 08:30:28 +08:00 |
|
YunaiV
|
4a23a696f4
|
1. 修复“登陆”=》“登录”
2. 增加社交平台的绑定与解绑
|
2021-10-06 09:33:21 +08:00 |
|
YunaiV
|
79f9f7b93d
|
优化登陆日志,增加 userId、userType,更多的 loginType
|
2021-10-06 01:03:54 +08:00 |
|
YunaiV
|
7b3a283074
|
增加三方登陆相关的表结构
|
2021-10-03 00:35:57 +08:00 |
|
weir
|
133cb49c42
|
接入第三方登录(已接入Gitee[理论justAuth支持都可以接入]--抢先预览版
|
2021-08-13 23:44:52 +08:00 |
|
YunaiV
|
bbfa4783d4
|
同步最新表结构与数据
|
2021-05-03 12:02:39 +08:00 |
|
YunaiV
|
6f6e8777e7
|
1. SQL 同步最新
2. 优化 trace 相关的逻辑
|
2021-04-27 00:32:57 +08:00 |
|
YunaiV
|
49a386d7be
|
错误码模块完成
|
2021-04-22 00:49:20 +08:00 |
|
YunaiV
|
2e27a4244c
|
同步新的 sql
|
2021-04-18 00:37:35 +08:00 |
|
YunaiV
|
fbbcd2717a
|
短信模板的创建 Test 单元测试
|
2021-04-05 23:52:24 +08:00 |
|
YunaiV
|
162d604644
|
Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into sms_temp_zzf_0127
|
2021-03-22 23:42:59 +08:00 |
|
YunaiV
|
64b085ae0d
|
1. 修复所有的单元测试
2. 最新的 sql 脚本
|
2021-03-21 20:10:04 +08:00 |
|
芋道源码
|
d5fb438f59
|
!20 Job 模块单元测试
Merge pull request !20 from neilz/feature/ut-job
|
2021-03-14 23:54:25 +08:00 |
|
YunaiV
|
f4818d26d6
|
整理 permission、user 模块的 url
|
2021-03-14 22:46:39 +08:00 |
|
neilz
|
ca9458088c
|
Merge branch 'master' of gitee.com:zhijiantianya/ruoyi-vue-pro into feature/ut-job
|
2021-03-14 20:59:59 +08:00 |
|
YunaiV
|
2e58e8585e
|
Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into sms_temp_zzf_0127
Conflicts:
pom.xml
src/main/java/cn/iocoder/dashboard/framework/redis/core/RedisKeyDefine.java
src/main/java/cn/iocoder/dashboard/framework/redis/core/RedisKeyRegistry.java
src/main/java/cn/iocoder/dashboard/framework/security/config/SecurityConfiguration.java
src/main/java/cn/iocoder/dashboard/modules/infra/controller/redis/RedisController.java
src/main/java/cn/iocoder/dashboard/modules/system/dal/redis/RedisKeyConstants.java
src/main/java/cn/iocoder/dashboard/modules/system/service/dict/impl/SysDictDataServiceImpl.java
src/main/java/cn/iocoder/dashboard/modules/system/service/permission/impl/SysPermissionServiceImpl.java
|
2021-03-14 18:42:52 +08:00 |
|
YunaiV
|
11b8afc4c7
|
补下 sql 脚本
|
2021-03-14 18:04:35 +08:00 |
|
neilz
|
0775e85aac
|
Quartz 相关表新增初始化任务sql sysUserSessionTimeoutJob
|
2021-03-14 15:35:42 +08:00 |
|
YunaiV
|
cee1aa3e60
|
增加文件服务的展示
|
2021-03-13 13:37:59 +08:00 |
|
zengzefeng
|
225664550f
|
实现短信通过redis stream异步发送,实现短信callback处理
|
2021-03-12 11:32:04 +08:00 |
|
YunaiV
|
28d9ecee3b
|
1. 处理 Job 日志导出的 excel 名字错误的问题
|
2021-03-10 01:32:11 +08:00 |
|