|
|
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 |
|
|
|
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 |
|
chenyunlong
|
c0c7ae7f15
|
Effort Task #4099 Cost:0.5h 合并行和列数字调整
|
2023-07-27 21:32:42 +08:00 |
|
|
|
4a9daea833
|
Merge branch 'dev' into beta
|
2023-07-27 20:53:20 +08:00 |
|
chenyunlong
|
b69f6af1e7
|
Effort Task #4099 Cost:0.5h 合并行和列数字调整
|
2023-07-27 20:41:26 +08:00 |
|
|
|
de88e68f91
|
Effort Task #7373 Cost:1h Left:8h 漏洞修复，xstream依赖版本升级到1.4.20
|
2023-06-14 10:45:04 +08:00 |
|
|
|
aabc3449ac
|
Effort Task #7373 Cost:1h Left:8h 漏洞修复，xstream依赖版本升级
|
2023-06-14 10:43:25 +08:00 |
|
|
|
929ec3b321
|
Dockerfile_prod
|
2023-03-10 18:41:47 +08:00 |
|
|
|
5dcf31b6d5
|
Dockerfile_prod
|
2023-03-10 18:29:25 +08:00 |
|
|
|
3e710191cc
|
Dockerfile_prod
|
2023-03-10 18:12:29 +08:00 |
|
|
|
9f6d3824dd
|
sim环境token修改
|
2023-02-27 14:48:15 +08:00 |
|
|
|
1ad1e95356
|
Dockerfile_sim端口修改
|
2023-02-27 13:47:43 +08:00 |
|
|
|
2635fb065f
|
增加sim和prod两个配置文件
|
2023-02-27 13:46:15 +08:00 |
|
|
|
a70c2047fb
|
Dockerfile_gray 端口修改
|
2023-02-24 19:07:50 +08:00 |
|
|
|
e9202a548a
|
还原商品为9089
|
2023-02-24 19:01:05 +08:00 |
|
|
|
0fccf80e53
|
Dockerfile_gray端口改为8080
|
2023-02-24 18:09:10 +08:00 |
|
|
|
8716ceb232
|
Dockerfile_prod端口和健康检查修改
|
2023-02-24 18:02:55 +08:00 |
|
|
|
5218675a1a
|
Merge branch 'beta' into dev
# Conflicts:
# server/src/main/java/cn/keking/web/controller/ContractController.java
|
2023-02-23 17:33:52 +08:00 |
|
|
|
5b1fb0d83b
|
生产环境dockerfile重命名
|
2023-02-23 17:29:53 +08:00 |
|
|
|
a889588baa
|
更新 'server/src/main/resources/application-dev.properties'
|
2022-09-07 16:01:09 +08:00 |
|
