linweidong
/
besure_server
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
5,630 Commits
4 Branches
0 Tags
169 MiB
main
liutao_branch
hhk
plp
Branches Tags
${ item.name }
Create tag ${ searchTerm }
Create branch ${ searchTerm }
from 'ae763f727f'
${ noResults }
Commit Graph

98 Commits (ae763f727fe1a4dc3c251d07002f2cc5b7f6f548)

Author SHA1 Message Date
YunaiV e40c0e3057 Merge branch 'feature/mall_product' of https://gitee.com/zhijiantianya/ruoyi-vue-pro 
# Conflicts:
#	pom.xml
#	sql/mysql/pay_wallet.sql
#	yudao-framework/yudao-spring-boot-starter-mybatis/src/main/java/cn/iocoder/yudao/framework/mybatis/core/mapper/BaseMapperX.java
 2 years ago
YunaiV c7a21b2a64 mall：优化商品收藏的分页接口 2 years ago
zhijiantianya@gmail.com 7e6b084f77 Merge branch 'feature/vo-optimize' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/sub-table 2 years ago
YunaiV ddb5bce0a2 vo 简化：post 重构 2 years ago
YunaiV 06649624e5 代码生成：支持设置主子表的信息 2 years ago
YunaiV 256c560d43 代码生成：增加主子表的示例 2 years ago
YunaiV 01b62a9b0c Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/sub-table 2 years ago
zhijiantianya@gmail.com 2f6456e2b0 代码生成器：主子表，支持多个从字段 50% 2 years ago
niou233 daa7d14b09 reafactor: 会员商品收藏 2 years ago
YunaiV 2afc2caf1d 代码生成：主子表的部分实现 2 years ago
dongshanshan 98aae5ed1a feat: 会员商品收藏 2 years ago
owen 0612a13cce 交易：核销订单 2 years ago
YunaiV c8f1269d6e promotion：修复砍价活动返回的 combinationPrice 为空的问题 2 years ago
YunaiV 1bda3c8b53 promotion：完善砍价 API ~ 提交下，准备出门吃饭！！！！ 2 years ago
YunaiV 8b50cd9661 Merge branch 'feature/mall_product' of https://gitee.com/zhijiantianya/ruoyi-vue-pro 
 Conflicts:
	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/combination/AppCombinationRecordController.java
	yudao-module-mall/yudao-module-trade-api/src/main/java/cn/iocoder/yudao/module/trade/enums/ErrorCodeConstants.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
 3 years ago
YunaiV a5e33f6d3a 引入 mybatis plus join 作为基类 3 years ago
YunaiV 5808f77ade code review：订单分佣 3 years ago
YunaiV 7d99c6dbe8 Merge branch 'master' of https://github.com/YunaiV/ruoyi-vue-pro 3 years ago
芋道源码 544e650e15
Merge pull request #326 from Lemon-cc-hang/base 
fix: 在调用 selectList() 的时候 如果 Collection 参数为空会报错 sql 异常
 3 years ago
YunaiV acee734554 Merge branch 'master' of https://github.com/YunaiV/ruoyi-vue-pro 3 years ago
JUNHAO 5cc3e6510b 使用Parenthesis为原有表达式添加括号 3 years ago
lemoncc 5b9106fdb5
fix: 在调用 selectList() 的时候 如果 Collection 参数为空会报错 sql 异常 3 years ago
YunaiV 5e2fa48f20 code review：拼团、秒杀活动的代码 3 years ago
YunaiV 5e7e3d816c 彻底移除 RedisKeyDefine 3 years ago
wcz a6ffb5d650 BaseMapperX.java少了几个方法，TradeCartMapper.java方法调整，BpmProcessInstanceServiceImpl.java多了 3 years ago
YunaiV 859cf74a6c 对齐 boot 与 cloud 的代码 3 years ago
YunaiV d9522808eb 优化 LambdaQueryWrapperX 的 inIfPresent 判空逻辑 3 years ago
YunaiV b582206003 mall + promotion：review 页面装修 3 years ago
jason ad1f656dfa 页面装修修改,后端只负责存取 3 years ago
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
 3 years ago
YunaiV 4f5ac0edbb mall + promotion：增加营销活动的 mock 接口 3 years ago
YunaiV 0631c51d93 mall + trade：review 配置管理列表 3 years ago
jason 55dbff7570 运费模板 review 修改. 运费模块可以选择多个区域 3 years ago
LiuZijian 8ec0be01a8 新增：达梦数据库驱动，KeyGenerator 3 years ago
YunaiV da162853ec 商城：完善购物车的逻辑 3 years ago
YunaiV 5c0161d762 修复租户名的重复问题 3 years ago
shizhong 8d2c33e9b0 解决字符串型字段等值查询条件前端传空字符串不能正常忽略问题 3 years ago
wangzhs f9569f910f 切换 Mybatis-plus-join 依赖 3 years ago
wangzhs 7e0fb6cb56 调整Mybaits Plus Join的SQL注入器到YudaoMybatisAutoConfiguration 3 years ago
YunaiV ef510f9478 增加 mybatis plus join 集成的修改建议 3 years ago
wangzhs 670f67e551 新增 mybatis-plus-join 3 years ago
YunaiV ae3ee95cdd 站内信模块：整体功能实现 3 years ago
YunaiV c744e115e3 简化本地缓存的实现，萌新更容易看懂！ 3 years ago
xingyu 3df825034b chore: update deps 3 years ago
YunaiV 92632c046c Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/1.8.0-uniapp 
# Conflicts:
#	yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/jackson/config/YudaoJacksonAutoConfiguration.java
#	yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/service/notify/PayNotifyServiceImpl.java
#	yudao-ui-admin/src/views/mall/trade/order/index.vue
 3 years ago
gaibu 766b74f040 fix: SQL 条件表达式缺少括号问题 3 years ago
gaibu 453603b6ad fix: SQL 条件表达式缺少括号问题 3 years ago
halfninety abbb076859 完成秒杀时段，秒杀活动相关todo 3 years ago
xingyu 283aae1da2 feat: 适配springboot 2.7 configuration ==> AutoConfiguration 3 years ago
xingyu 1aa05e0198 feat: 适配 springboot 2.7 3 years ago