|
|
cc44f8f5c2
|
Merge pull request 'beta' (#15) from beta into master
Reviewed-on: crm/crm-print#15
|
2024-08-01 18:05:33 +08:00 |
|
|
|
170e449f4e
|
Merge pull request '修改 Dockerfile_prod' (#14) from dev into beta
Reviewed-on: crm/crm-print#14
|
2024-08-01 18:05:03 +08:00 |
|
luob
|
f94a551286
|
修改 Dockerfile_prod
|
2024-08-01 11:54:43 +08:00 |
|
|
|
5f0b373d3b
|
Merge pull request 'beta' (#13) from beta into master
Reviewed-on: crm/crm-print#13
|
2024-05-30 17:27:15 +08:00 |
|
|
|
e1d0aee060
|
Merge pull request '打印支持俄文' (#12) from dev into beta
Reviewed-on: crm/crm-print#12
|
2024-05-30 14:05:21 +08:00 |
|
|
|
ade7ee8cbd
|
打印支持俄文
|
2024-05-30 11:28:52 +08:00 |
|
|
|
5cc7545233
|
Merge pull request '修改 Dockerfile_gray' (#11) from dev into beta
Reviewed-on: crm/crm-print#11
|
2024-05-28 14:30:41 +08:00 |
|
luob
|
2309df3a99
|
修改 Dockerfile_gray
|
2024-05-28 14:29:55 +08:00 |
|
|
|
8122a51f29
|
Merge pull request '打印支持韩文' (#10) from dev into beta
Reviewed-on: crm/crm-print#10
|
2024-05-28 14:00:29 +08:00 |
|
|
|
7a743e871d
|
打印支持韩文
|
2024-05-28 13:50:24 +08:00 |
|
|
|
2b3a041a29
|
Merge pull request '打印支持韩文' (#9) from dev into beta
Reviewed-on: crm/crm-print#9
|
2024-05-28 11:23:45 +08:00 |
|
|
|
6c9450cc94
|
打印支持韩文
|
2024-05-28 11:21:07 +08:00 |
|
|
|
759fb54ead
|
Effort Task #9427 Cost:1h Left:0h 引入nacos配置，服务器地址修改
|
2024-01-30 11:31:13 +08:00 |
|
|
|
f60b86da4f
|
Merge branch 'dev' into beta
|
2024-01-30 11:26:57 +08:00 |
|
|
|
fec69fcecd
|
Effort Task #9427 Cost:1h Left:0h 引入nacos配置，配置调整
|
2024-01-30 11:08:54 +08:00 |
|
|
|
de3a4cb120
|
Effort Task #9427 Cost:1h Left:0h 引入nacos配置，配置调整
|
2024-01-30 10:43:11 +08:00 |
|
|
|
4a3d56407c
|
Merge pull request 'beta' (#8) from beta into master
Reviewed-on: crm/crm-print#8
|
2024-01-12 17:38:55 +08:00 |
|
|
|
5a84afd8bc
|
dev 合并到 beta 还是有区别，再调整一次
|
2024-01-12 10:53:08 +08:00 |
|
|
|
3f5dd2d165
|
Merge pull request 'dev 合并到 beta 还是有区别，再调整一次' (#7) from dev into beta
Reviewed-on: crm/crm-print#7
|
2024-01-12 10:35:32 +08:00 |
|
|
|
82fef86d12
|
dev 合并到 beta 还是有区别，再调整一次
|
2024-01-12 10:34:12 +08:00 |
|
|
|
d5d1137e3c
|
dev 合并到 beta 还是有区别
|
2024-01-12 10:27:28 +08:00 |
|
|
|
f412e56114
|
Merge pull request 'dev' (#6) from dev into beta
Reviewed-on: crm/crm-print#6
|
2024-01-12 10:12:11 +08:00 |
|
daijunxiong
|
3494cd3a17
|
Finish Task #9031 Cost:3h 修改dockerfile
|
2024-01-12 10:10:07 +08:00 |
|
daijunxiong
|
461dc26a7d
|
Finish Task #9031 Cost:3h 修改dockerfile
|
2024-01-12 10:08:30 +08:00 |
|
daijunxiong
|
acd0c1982d
|
Finish Task #9031 Cost:3h 修改dockerfile
|
2024-01-12 10:06:42 +08:00 |
|
|
|
f170c60d3f
|
Merge pull request 'dev' (#5) from dev into beta
Reviewed-on: crm/crm-print#5
|
2024-01-12 09:13:24 +08:00 |
|
daijunxiong
|
ac1274b565
|
Finish Task #9031 Cost:3h 开发导出word
|
2024-01-09 14:01:26 +08:00 |
|
daijunxiong
|
aefd70308e
|
Finish Task #9031 Cost:3h 开发导出word
|
2024-01-09 12:25:57 +08:00 |
|
daijunxiong
|
3c75bedb8e
|
Finish Task #9031 Cost:3h 开发导出word
|
2024-01-09 12:21:07 +08:00 |
|
daijunxiong
|
8bab53a026
|
Finish Task #9031 Cost:3h 开发导出word
|
2024-01-09 11:41:51 +08:00 |
|
|
|
b995656323
|
Merge pull request 'beta' (#4) from beta into master
Reviewed-on: crm/crm-print#4
|
2023-12-24 16:20:40 +08:00 |
|
|
|
3cd4cf8e1c
|
Merge pull request 'dev' (#3) from dev into beta
Reviewed-on: crm/crm-print#3
|
2023-12-21 17:53:15 +08:00 |
|
时间淡忘一切
|
692b678d8e
|
Merge branch 'master' into dev
|
2023-12-21 17:47:06 +08:00 |
|
时间淡忘一切
|
6546b269ef
|
Finish Task #9031 Cost:3h 开发导出word
|
2023-12-21 17:46:36 +08:00 |
|
|
|
c9f7c850f6
|
Merge branch 'dev' into beta
|
2023-12-07 13:38:35 +08:00 |
|
时间淡忘一切
|
f52b5ef762
|
Finish Task #8394 Cost:8h 【PC端】新增海外订单排产需求
|
2023-11-06 09:16:31 +08:00 |
|
时间淡忘一切
|
b491b9a30b
|
Fix Bug #29411 修复组织数据在redis为空的时候，导致数据转换失败
|
2023-10-12 18:04:27 +08:00 |
|
时间淡忘一切
|
9e9de4d232
|
Fix Bug #29411 修复组织数据在redis为空的时候，导致数据转换失败
|
2023-10-12 18:01:30 +08:00 |
|
时间淡忘一切
|
8658c56976
|
Fix Bug #29411 修复组织数据在redis为空的时候，导致数据转换失败
|
2023-10-12 18:01:10 +08:00 |
|
时间淡忘一切
|
5d3b21da57
|
Fix Bug #29411 修复组织数据在redis为空的时候，导致数据转换失败
|
2023-10-12 17:46:02 +08:00 |
|
|
|
6c4f479b52
|
更新 'Dockerfile_gray'
|
2023-10-12 17:34:56 +08:00 |
|
|
|
a148e2e0c4
|
更新 'Dockerfile_gray'
|
2023-10-12 17:33:08 +08:00 |
|
|
|
6566bc6ead
|
更新 'Dockerfile_gray'
|
2023-10-12 17:30:56 +08:00 |
|
|
|
252850b53d
|
更新 'Dockerfile_gray'
|
2023-10-12 17:30:12 +08:00 |
|
|
|
510a37abac
|
更新 'Dockerfile_gray'
|
2023-10-12 17:27:24 +08:00 |
|
|
|
8aef25f377
|
Merge pull request '更新 'Dockerfile_gray'' (#2) from daijunxiong-patch-3 into beta
Reviewed-on: crm/crm-print#2
|
2023-10-12 17:11:35 +08:00 |
|
|
|
c508ee8900
|
更新 'Dockerfile_gray'
|
2023-10-12 17:09:28 +08:00 |
|
|
|
6a36a3b324
|
Merge pull request '更新 'Dockerfile_gray'' (#1) from daijunxiong-patch-2 into beta
Reviewed-on: crm/crm-print#1
|
2023-10-12 17:06:15 +08:00 |
|
|
|
cea61bb669
|
更新 'Dockerfile_gray'
|
2023-10-12 17:02:09 +08:00 |
|
|
|
82313a7470
|
Merge branch 'dev' into beta
|
2023-07-27 21:33:25 +08:00 |
|
