Commit Graph

1748 Commits (cdd7f29d4a6b9d9969e90b454caa77220cd5b4e7)

Author SHA1 Message Date
JEECG 80b92ca132 flowable、activiti都支持 2024-03-22 16:22:48 +08:00
JEECG 58865bef28 jimureport-drag:2.0.1 报错 java.lang.IllegalStateException: No TaglibFactory available #6021 2024-03-20 22:59:27 +08:00
JEECG 9fd40d0973 代码生成器jar包中携带配置文件导致 spring.profiles.active 被覆盖 #6010 2024-03-20 10:07:54 +08:00
Gauthier LO 62a30a9754 fix : breakdown invoicing wrong erp status orders 2024-03-18 12:27:42 +01:00
Gauthier LO dc5713d5c4 (wip) invoice management remake 2024-03-18 10:37:46 +01:00
JEECG fee729e16c 【回滚】暂时回退mybatisplus、minidao版本,online模块不兼容 2024-03-18 14:06:09 +08:00
JEECG 10a3e9c6ba 升级knife4j、mybatisplus、justauth、minidao版本 2024-03-18 10:11:05 +08:00
JEECG 990f79fdfe 调整flyway配置,检查数据库类型只有mysql才启用 2024-03-18 09:27:54 +08:00
JEECG 6360aee0ff 【QQYUN-8561】企业微信登陆请求接口设置上下文不一致,导致接口404 2024-03-18 09:25:51 +08:00
Qiuyi LI f4a4068e97 Add shop ERP code to ShoumanOrderContent 2024-03-15 17:31:28 +01:00
JEECG 685b81e5ec
Merge pull request #5930 from EightMonth/master
处理 #5601 ,添加@ignoreAuth注解
2024-03-15 15:30:48 +08:00
EightMonth e38e395436
Merge branch 'master' into master 2024-03-15 15:29:35 +08:00
Qiuyi LI c435377fca Update project version 2024-03-14 16:06:58 +01:00
Qiuyi LI 0a372b0994 Create a job to automatically remove virtual products from Mabang orders 2024-03-14 16:06:12 +01:00
Qiuyi LI 6429a6ab2a Exclude existing order IDs when constructing new Shouman orders 2024-03-14 13:04:26 +01:00
Gauthier LO e5fe9a4989 feature : Create Mabang Purchase Order 2024-03-12 16:22:17 +01:00
Qiuyi LI 06228752d8 Update project version 2024-03-12 12:15:05 +01:00
Qiuyi LI f0bbb1c02c Update CJ_LOGISTICS tracking number pattern 2024-03-12 12:14:35 +01:00
zhangdaiscott 39af6e25ee ChatGPT AI助手,对接配置文档 2024-03-11 19:08:33 +08:00
zhangdaiscott b15e6e0422 【优化代码生成功能】uniapp调整目录 2024-03-09 22:30:41 +08:00
zhangdaiscott 8f99a80352 【优化代码生成功能】uniapp调整目录、升级sql的命名改成flyway规则 2024-03-09 22:11:00 +08:00
zhangdaiscott 936a87e738 积木报表 v1.7.2 紧急发布,修复 1.7.1 严重 Bug 2024-03-07 22:32:39 +08:00
zhangdaiscott 2af165b201 【3.6.3版本发布】初始化sql有问题启动报flyway错误 2024-03-07 11:30:51 +08:00
zhangdaiscott 3d5efc07ad 【3.6.3版本发布】升级积木报表的升级SQL 2024-03-06 19:02:39 +08:00
zhangdaiscott 21e8d640d2 【3.6.3版本发布】升级积木报表的升级SQL 2024-03-06 18:55:35 +08:00
zhangdaiscott b0ce456909 【3.6.3版本发布】升级积木报表的升级SQL 2024-03-06 18:45:44 +08:00
zhangdaiscott b8e1306955 【3.6.3版本发布】升级积木报表的升级SQL 2024-03-06 18:44:35 +08:00
zhangdaiscott 37a38ad288 【3.6.3版本发布】升级版本号 2024-03-06 17:13:05 +08:00
zhangdaiscott 9ee05c9510 【3.6.3版本发布】新版数据库脚本 2024-03-06 17:00:54 +08:00
zhangdaiscott 275a68bb6a 忽略文件 2024-03-06 16:24:23 +08:00
zhangdaiscott f3f70e8549 【3.6.3版本发布】代码修复 2024-03-06 16:22:36 +08:00
zhangdaiscott e15e9d80c4 【3.6.3版本发布】ai聊天模块新增代码 2024-03-06 16:22:03 +08:00
zhangdaiscott f7538c1ed8 【3.6.3版本发布】首页支持自定义 2024-03-06 16:20:49 +08:00
zhangdaiscott a9dba08a8d 【3.6.3版本发布】性能优化部分代码 2024-03-06 16:19:51 +08:00
Qiuyi LI c52c115942 Update project version 2024-03-05 16:32:04 +01:00
Qiuyi LI bbd148cb51 Apply a throttler of 40 requests per minute to ShopifySyncJob
(cherry picked from commit 188c5601bd)
2024-03-05 16:30:39 +01:00
Qiuyi LI d602d71e1c
Merge pull request #63 from LQYBill/shopify_auto_sync
Apply a throttler of 40 requests per minute to ShopifySyncJob
2024-03-05 16:27:32 +01:00
Qiuyi LI 188c5601bd Apply a throttler of 40 requests per minute to ShopifySyncJob 2024-03-05 15:53:11 +01:00
Qiuyi LI 4a7e8bdce8 Update Shouman order creation request according to provider's demand 2024-03-05 15:32:42 +01:00
Qiuyi LI 32c09f5bc9 Only take Pending orders to create Shouman orders 2024-03-05 15:31:45 +01:00
Qiuyi LI 8e84419a63 Merge branch 'dev' into shouman_api
# Conflicts:
#	jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/entity/PlatformOrder.java
#	jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/xml/PlatformOrderMabangMapper.xml
2024-02-29 11:47:40 +01:00
EightMonth acf0713385 Update ShiroConfig.java 2024-02-29 17:43:56 +08:00
EightMonth cee872000a 处理 #5601 ,添加@ignoreAuth注解 2024-02-29 17:11:44 +08:00
zhangdaiscott 4a857680d0 原生表单新增携带 createTime 等系统字段 #1033 2024-02-23 09:59:19 +08:00
Qiuyi LI 8253ba1877
Merge pull request #62 from LQYBill/fix/addPurchaseMabang
fix : missing content in body
2024-02-20 17:09:03 +01:00
Qiuyi LI 4f49712e74
Merge pull request #61 from LQYBill/feature/addPurchaseMabang
fix : mabang sku job error
2024-02-20 17:08:46 +01:00
Gauthier LO 31fd3341f0 fix : missing content in body 2024-02-20 17:06:56 +01:00
Gauthier LO 6f45be2f59 fix : mabang sku job error 2024-02-20 15:52:16 +01:00
Qiuyi LI 7ac083f40e
Merge pull request #59 from LQYBill/feature/addPurchaseMabang
feature : Sku purchase order Mabang API
2024-02-20 15:43:39 +01:00
Qiuyi LI c39581ca61
Merge pull request #60 from LQYBill/release
Release 1.10.0
2024-02-20 15:25:51 +01:00