74 Commits (20f8cb1606e503749245e13863b26b13627aba60)

Author SHA1 Message Date
YunaiV 20f8cb1606 2.0.1 版本发布准备 2 years ago
YunaiV 0dff03b8b1 🔥 2.0.0 版本发布准备~ 2 years ago
芋道源码 a5dc4e7876
!839 流程增加抄送功能
Merge pull request !839 from 云开/feature/BPM_CC_develop
2 years ago
jay浅蓝 867d8bc3cd
update sql/mysql/ruoyi-vue-pro.sql.
数据库缺少trade:order:query 和 trade:order:update权限,会导致订单的发货和更多按钮无法显示。


Signed-off-by: jay浅蓝 <565215951@qq.com>
2 years ago
kyle 8f171ba3d0 feat: 添加抄送人相关功能以及接口 2 years ago
YunaiV 73e76ab453 Merge remote-tracking branch 'origin/master' into feature/crm
# Conflicts:
#	yudao-module-crm/yudao-module-crm-biz/src/test/java/cn/iocoder/yudao/module/crm/service/contract/ContractServiceImplTest.java
#	yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dict/DictDataController.java
2 years ago
YunaiV f02b9464bd crm: 增加基于客户查询回款分页 2 years ago
YunaiV a5c59c6079 1.9.0 版本发布 2 years ago
YunaiV eeeafcc10c 1.9.0 版本发布 2 years ago
JiangQi 0955ad0fc0 promotion:combination-activity:query后多个tab 2 years ago
liuhongfeng 58ede7d69c 【修改】最新的SQL字符编码不一致导致创建表失败,修改utf8mb4_0900_ai_ci=》utf8mb4_unicode_ci 2 years ago
YunaiV 7ac74b44d8 同步最新 SQL 脚本 2 years ago
YunaiV ac80aa97b3 代码生成:优化前端模版的 package 路径 2 years ago
YunaiV c162b39e1e 多租户:调整 tenant 表的 domain 字段为 website,避免 dm 数据库的关键字冲突 2 years ago
YunaiV f9e64a9f0a 同步最新 SQL 2 years ago
YunaiV d256275099 saas:支持社交应用的多租户配置 2 years ago
YunaiV 5842a361e2 同步最新 SQL 脚本 2 years ago
YunaiV ca5e3f7bd1 优化最新的商城的 sql 2 years ago
YunaiV 6a04d6c458 promotion:新增助力记录列表 2 years ago
YunaiV 057952bdeb Merge branch 'feature/mall_product' of https://gitee.com/CrazyWorld/ruoyi-vue-pro into feature/mall_product
# Conflicts:
#	yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/util/date/LocalDateTimeUtils.java
2 years ago
YunaiV b74169acfc trade:优化订单列表的查询 2 years ago
owen 2168145c3e 会员:会员配置的积分相关字段加上point前缀 2 years ago
owen ab35fcbe9b 会员:积分配置改为会员配置 2 years ago
owen 4f03635fcd 签到:签到后增加用户积分、经验 2 years ago
YunaiV 5913ee0706 Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/mall_product
# Conflicts:
#	yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/jackson/config/YudaoJacksonAutoConfiguration.java
#	yudao-module-mall/yudao-module-promotion-api/src/main/java/cn/iocoder/yudao/module/promotion/enums/ErrorCodeConstants.java
#	yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/bargain/vo/activity/AppBargainActivityDetailRespVO.java
#	yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/bargain/vo/activity/AppBargainActivityRespVO.java
#	yudao-module-mall/yudao-module-trade-api/src/main/java/cn/iocoder/yudao/module/trade/enums/ErrorCodeConstants.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/order/vo/AppTradeOrderSettlementReqVO.java
#	yudao-module-member/yudao-module-member-api/src/main/java/cn/iocoder/yudao/module/member/enums/ErrorCodeConstants.java
#	yudao-module-pay/yudao-module-pay-api/src/main/java/cn/iocoder/yudao/module/pay/enums/ErrorCodeConstants.java
#	yudao-server/src/main/resources/application-local.yaml
2 years ago
owen 0a3a6825d5 优惠券:完善APP优惠券查询接口 2 years ago
YunaiV 9b7c757942 1.8.2 版本发布 2 years ago
dhb52 2a9aa357cb fix: 对具有软删除的表去除UNIQUE INDEX 2 years ago
YunaiV 36b3cfafd2 同步 v1.8.1 SQL 脚本 2 years ago
YunaiV 26129b52a8 同步最新 SQL 脚本 2 years ago
YunaiV d82729e4c6 同步最新会员中心 SQL 2 years ago
YunaiV c3e4e23459 同步最新 Member 菜单 2 years ago
YunaiV a83c156bf1 code review:签到记录 2 years ago
YunaiV c5e85f3bfb code review:签到配置 2 years ago
xiaqing 2e9dfac9ab 会员积分和会员签到模块todo修改 3 years ago
YunaiV 00e1c30f57 1. 修复创建支付应用,界面会报错的问题
2. 同步最新 SQL 文件
3 years ago
YunaiV 2485a5ebc9 mall + pay:
1. 将 amount 统一都修改成 price
2. 将 payed 统一改成 payStatus
3 years ago
YunaiV 5d2d52020e mall + pay:简化 pay 的复杂度
1. 移除 merchant 表设计
2. 移除 app 和 channel 的导出
3 years ago
puhui999 32cca12cd2 fix:seckillTime => seckillConfig 3 years ago
YunaiV 8eac97ae12 移除 Vue3 专属菜单,统一菜单! 3 years ago
xingyuv 70f632852b chore: up hutool 5.8.15 3 years ago
xingyuv 760a1d31d5 feat: 代码生成 vben 3 years ago
YunaiV d500332a18 代码生成,支持配置前端 UI 类型 3 years ago
YunaiV 35ba9b36af 菜单新增 alwaysShow 总是展示、componentName 组件名 3 years ago
xingyuv fe5f1c74a4 fix: router 3 years ago
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
3 years ago
xingyu 2ea9027031 mp user => mp mpuser 3 years ago
xingyu 227361661f fix: mp menu error 3 years ago
YunaiV f7762e646e 站内信模块:我的站内信 vue3 3 years ago
YunaiV 1a4bea8ca2 邮箱模块:同步最新的 SQL 脚本 3 years ago