github
/
jeecg-boot
mirror of https://github.com/jeecgboot/jeecg-boot
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
1,520 Commits
3 Branches
69 Tags
146 MiB
Commit Graph

1520 Commits (94c7afb6d1c97a9b71fe00435e7f796764a70675)

Author SHA1 Message Date
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
Gauthier LO faa3636c3d feature : Sku purchase order Mabang API 2024-02-20 15:19:07 +01:00
Qiuyi LI 31170f3197 Update project version 2024-02-20 15:12:27 +01:00
zhangdaiscott a47d0984dc [issues/5755]vue代码不加入逻辑删除字段 
[issue/#5711]修复用户选择组件在生成代码后变成部门用户选择组件
[issues/1022]我这个控件是哪里设置没对吗，为什么打开已有的记录，会触发提示“请输入”验证？ #1022
fix 带条件字典存在单引号导致js编译错误
 2024-02-19 16:40:33 +08:00
Qiuyi LI 26d3c61c08
Merge pull request #58 from LQYBill/feature/PurchaseInvoicePage 
product order
 2024-02-16 11:54:19 +01:00
Gauthier LO 48f445856d product order 2024-02-12 12:34:33 +01:00
Qiuyi LI d6090138d8
Merge pull request #57 from LQYBill/dev 
Release 1.10.0
 2024-01-30 16:17:53 +01:00
Qiuyi LI 419033c6d2 Add CJLogistics(Korea) tracking number pattern 2024-01-30 16:15:11 +01:00
Qiuyi LI 7d62bfcb82 Add LabelId to AddOrderAbnNumberRequestBody 2024-01-30 16:14:37 +01:00
Qiuyi LI 32fe62afee
Merge pull request #56 from LQYBill/shopify_pcode 
Korean Pcode in Shopify notes
 2024-01-26 17:13:04 +01:00
Qiuyi LI b1bba7ba03 Include chrome portrait SKU patterns in AddPortraitTubeJob 2024-01-26 17:06:51 +01:00
Qiuyi LI 8c7ffc8849 Create AddOrderAbnNumberJob to send AbnNumber to orders in Mabang 2024-01-26 17:06:13 +01:00
Qiuyi LI 2e9c129b77 Create ShopifyNoteJob to retrieve notes in Shopify orders 2024-01-26 17:04:52 +01:00
Qiuyi LI 8be315c617 Insert/Update tax number in PlatformOrder in MabangJob 2024-01-26 16:58:33 +01:00
Qiuyi LI f458268f4d Update PlatformOrder model 2024-01-26 16:53:36 +01:00
Qiuyi LI c4c9390acc Remove status setting in MabangOrderSyncJob since allstatus are now automatically added 2024-01-26 16:48:26 +01:00
Qiuyi LI 8e881edd54 Add allstatus parameter when platformIds field is present in Mabang requests 2024-01-26 16:38:21 +01:00
Qiuyi LI b821e7f51b Use the latest Shopify API (upgrade from 2022-10 to 2024-01) 2024-01-26 16:35:40 +01:00
Qiuyi LI 316e4b1c67 Update Order model 2024-01-26 16:33:06 +01:00
Qiuyi LI f863a876aa Update Shop model 2024-01-26 16:27:58 +01:00
Qiuyi LI 5431617a87 Merge branch 'dev' into shouman_api 2024-01-12 16:39:52 +01:00
Qiuyi LI 2d9b6635b1
Merge pull request #55 from LQYBill/release 
Release
 2024-01-12 16:30:10 +01:00
Qiuyi LI 2c0dc9d805 Update version: release 1.9.3 2024-01-12 16:29:28 +01:00
Qiuyi LI 382eb3e65d
Merge pull request #54 from LQYBill/dev 
Release 1.9.3
 2024-01-12 16:23:35 +01:00
Qiuyi LI fdd5159032
Merge pull request #53 from LQYBill/fix/breakdownInvoice 
fix : reintroduce PDF in breakdownInvoice + conditional balance update
 2024-01-12 16:17:45 +01:00
Gauthier LO c64bed04ee fix : reintroduce PDF in breakdownInvoice + conditional balance update 
feature : SkuAssociationToClientJob
 2024-01-12 16:10:00 +01:00
Qiuyi LI a560ad7c9e Merge branch 'dev' into shouman_api 2024-01-11 17:03:50 +01:00
Qiuyi LI 4ca8ea4e84 Merge branch 'dev' into shouman_api 
# Conflicts:
#	jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/entity/Country.java
#	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/PlatformOrderContentMapper.java
#	jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/xml/PlatformOrderContentMapper.xml
 2024-01-11 17:02:54 +01:00
Qiuyi LI d8ab00463b
Merge pull request #52 from LQYBill/release 
Release
 2024-01-11 16:55:34 +01:00