Damonny
|
30959c0470
|
update: 订单生产维护
|
2025-01-03 05:31:08 +08:00 |
Owen
|
03cf7eca8c
|
广州电信
|
2025-01-01 20:48:26 +08:00 |
|
Owen
|
26cd9a5916
|
广州电信
|
2025-01-01 20:44:36 +08:00 |
|
Owen
|
a0eb3d87be
|
广州电信
|
2025-01-01 20:02:30 +08:00 |
|
Owen
|
a8c8994974
|
Merge remote-tracking branch 'origin/develop' into develop
|
2024-12-31 10:13:08 +08:00 |
|
Owen
|
33153a3df2
|
Feat: Api fix sql
|
2024-12-31 10:12:59 +08:00 |
|
Damonny
|
934661dbeb
|
update: sql update
|
2024-12-31 00:14:28 +08:00 |
|
Damonny
|
ec3deb209e
|
update: sql init
|
2024-12-31 00:10:36 +08:00 |
|
Damonny
|
db30ad48c7
|
update: 订单跟踪维护
|
2024-12-30 23:25:01 +08:00 |
|
Owen
|
a9250ed81c
|
Feat: 添加AIp策略
|
2024-12-29 22:47:40 +08:00 |
|
Damonny
|
c9460836d3
|
update: order dict sql
|
2024-12-28 23:33:29 +08:00 |
|
Owen
|
598d68cab3
|
Feat: Api 联通 + 地区整理
|
2024-12-26 18:22:06 +08:00 |
|
Owen
|
4df3bfb6b5
|
Merge remote-tracking branch 'origin/develop' into develop
|
2024-12-26 17:25:31 +08:00 |
|
Owen
|
f334360215
|
Feat: Api 联通 + 地区整理
|
2024-12-26 17:25:18 +08:00 |
|
Damonny
|
056929d289
|
update: order dict sql
|
2024-12-26 15:51:40 +08:00 |
|
Owen
|
b74e0eca7e
|
Feat: Api 联通 + 地区整理
|
2024-12-26 15:47:50 +08:00 |
|
Damonny
|
e0d6de9bf0
|
update: sql脚本调整
|
2024-12-23 17:46:18 +08:00 |
|
Damonny
|
14fdc2464c
|
update: sql脚本更改
|
2024-12-23 17:42:19 +08:00 |
|
Owen
|
101625fa00
|
Merge branch 'develop' of gitee.com:peng-ou/haoka-server into develop
|
2024-12-23 17:34:38 +08:00 |
|
Damonny
|
06fa269e6c
|
init:初始化订单来源列表查询
|
2024-12-23 02:43:17 +08:00 |
|
Owen
|
5907ab9605
|
Feat: Code gen V3 ok
|
2024-12-23 00:01:22 +08:00 |
|
Damonny
|
398395dd4e
|
init:初始化订单列表查询
|
2024-12-18 15:21:51 +08:00 |
|
Owen
|
0fe9c39bb3
|
Feat: Code gen V3 ok
|
2024-12-17 15:10:34 +08:00 |
|
Owen
|
a42bf5ce1d
|
Feat: Code gen V2 ok
|
2024-12-15 17:02:57 +08:00 |
|
Owen
|
ea0c6d3e33
|
Feat: Code gen product2
|
2024-12-15 16:12:51 +08:00 |
|
Owen
|
2a23f12188
|
Feat: Code gen V1
|
2024-12-15 14:40:51 +08:00 |
|
Owen
|
0ad6ab7304
|
Feat: haoka product generate ok1
|
2024-12-15 12:55:00 +08:00 |
|
Owen
|
9d517160f7
|
Feat: haoka product init sql
|
2024-12-15 04:20:25 +08:00 |
|
Owen
|
210f215716
|
Feat: haoka db/migration
|
2024-12-15 03:39:22 +08:00 |
|
Owen
|
09b12dc3a2
|
Feat: haoka db/migration
|
2024-12-15 03:35:43 +08:00 |
|
Owen
|
2769c0ffa5
|
Feat: haoka db/migration
|
2024-12-15 03:31:18 +08:00 |
|
Owen
|
f1a6916015
|
Feat: haoka db/migration
|
2024-12-14 18:03:10 +08:00 |
|
Owen
|
9f8622656a
|
Feat: haoka init demo
|
2024-12-14 15:02:19 +08:00 |
|
Owen
|
cbc1b5cec6
|
Feat: haoka init demo
|
2024-12-10 15:00:45 +08:00 |
|
Owen
|
14a926b435
|
init local.yaml
|
2024-12-06 19:08:29 +08:00 |
YunaiV
|
c239d9cc56
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into develop
# Conflicts:
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/kefu/AppKeFuMessageController.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/convert/combination/CombinationActivityConvert.java
|
2024-11-19 09:26:44 +08:00 |
痴货
|
325d5e6b12
|
【功能优化】完成转账回调接口
|
2024-10-08 21:25:52 +08:00 |
|
YunaiV
|
5f75fcb0fb
|
【代码优化】工作流：删除用不到的方法
|
2024-10-04 17:17:01 +08:00 |
|
YunaiV
|
9334edc9ea
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/bpm
# Conflicts:
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/task/BpmProcessInstanceServiceImpl.java
|
2024-10-03 11:28:22 +08:00 |
|
YunaiV
|
f7bed6d833
|
【代码评审】IoT：产品、设备、物模型的代码
|
2024-10-01 19:56:15 +08:00 |
|
YunaiV
|
44b466c678
|
Merge branch 'feature/iot' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into master-jdk17
# Conflicts:
# pom.xml
# yudao-dependencies/pom.xml
# yudao-server/pom.xml
|
2024-10-01 19:54:22 +08:00 |
|
YunaiV
|
2bbb7f86fe
|
【同步】BOOT 和 CLOUD 的功能
|
2024-10-01 14:39:30 +08:00 |
|
YunaiV
|
805f80c36a
|
【功能优化】INFRA：代码生成时，默认禁用单元测试的生成，更符合大家的习惯
|
2024-09-19 13:10:23 +08:00 |
|
YunaiV
|
4e8e491035
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/bpm
# Conflicts:
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/convert/definition/BpmModelConvert.java
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/behavior/BpmParallelMultiInstanceBehavior.java
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/behavior/BpmSequentialMultiInstanceBehavior.java
|
2024-09-17 15:34:30 +08:00 |
|
YunaiV
|
fee7267799
|
【代码优化】商城：价格计算相关逻辑
|
2024-09-15 15:38:38 +08:00 |
|
YunaiV
|
2876c7ce16
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into develop-tmp
# Conflicts:
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/coupon/AppCouponController.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/dal/mysql/coupon/CouponMapper.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/coupon/CouponService.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/coupon/CouponServiceImpl.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/seckill/SeckillActivityServiceImpl.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/price/calculator/TradeRewardActivityPriceCalculator.java
|
2024-09-15 11:24:32 +08:00 |
|
痴货
|
e44c0e668e
|
【功能】完成商品列表价格计算时，需要支持减免金额的功能
|
2024-09-14 19:01:57 +08:00 |
|
YunaiV
|
1e69face92
|
【代码评审】IOT：产品的管理
|
2024-09-07 20:38:49 +08:00 |
|
YunaiV
|
7c79aae2b4
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/iot
# Conflicts:
# yudao-server/src/main/resources/application-local.yaml
|
2024-09-07 20:37:57 +08:00 |
|
YunaiV
|
10334f3fb6
|
【代码评审】IOT：产品的管理
|
2024-09-07 20:37:13 +08:00 |