|
|
2d22ef944a
|
Merge branch 'uat' into 'dev'
Uat
See merge request eshop/biz_service_ebtp_extend!47
|
2021-06-21 09:31:13 +08:00 |
|
|
|
e7ca7a8096
|
修改表报打印bug
|
2021-06-21 09:29:44 +08:00 |
|
|
|
d2dd2ae97e
|
Merge branch 'master-password' into uat
|
2021-06-17 09:58:24 +08:00 |
|
|
|
f07eed422c
|
Merge branch 'master-password' into dev
|
2021-06-15 16:46:51 +08:00 |
|
|
|
ba7ccc4fd8
|
平台密码
|
2021-06-15 16:46:20 +08:00 |
|
|
|
f5ba7df73f
|
Merge branch 'master-password' into dev
|
2021-06-15 16:40:49 +08:00 |
|
|
|
6ebd72bd55
|
平台密码
|
2021-06-15 16:40:19 +08:00 |
|
|
|
aab03cb862
|
Merge branch 'master-password' into dev
|
2021-06-15 16:02:55 +08:00 |
|
|
|
d405d4d10f
|
平台密码
|
2021-06-15 16:02:18 +08:00 |
|
|
|
60adc738a0
|
Merge branch 'master-password' into dev
|
2021-06-15 14:54:17 +08:00 |
|
|
|
6481d1b436
|
平台密码
|
2021-06-15 14:53:46 +08:00 |
|
|
|
cf0ac4bf4d
|
Merge branch 'master-shared' into 'dev'
修改共享文档查询条件
See merge request eshop/biz_service_ebtp_extend!44
|
2021-06-08 14:16:52 +08:00 |
|
|
|
c7f38f1dba
|
Merge branch 'master-shared' into 'uat'
修改共享文档查询条件
See merge request eshop/biz_service_ebtp_extend!43
|
2021-06-08 14:16:36 +08:00 |
|
|
|
8188e60cce
|
Merge branch 'master-shared' into 'master'
修改共享文档查询条件
See merge request eshop/biz_service_ebtp_extend!42
|
2021-06-08 14:16:13 +08:00 |
|
|
|
e0d1ddd9d1
|
修改共享文档查询条件
|
2021-06-08 14:14:56 +08:00 |
|
|
|
ace383a37c
|
Merge branch 'master-shared' into uat
|
2021-06-05 11:34:15 +08:00 |
|
|
|
98aa0e32dc
|
Merge branch 'master-shared' into dev
|
2021-06-05 11:26:24 +08:00 |
|
|
|
b2a9cb9a1a
|
修改共享文档查询条件
|
2021-06-05 11:26:01 +08:00 |
|
|
|
14397a4802
|
修改报表打印bug
|
2021-06-03 09:46:58 +08:00 |
|
|
|
1cc0b2f931
|
修改报表打印bug
|
2021-06-03 09:14:28 +08:00 |
|
|
|
ac731bc690
|
Merge branch 'dev' into 'uat'
merge Dev to uat
See merge request eshop/biz_service_ebtp_extend!41
|
2021-06-02 14:20:29 +08:00 |
|
|
|
edcc5dc8a8
|
Merge branch 'uat' into dev
|
2021-05-28 15:32:01 +08:00 |
|
|
|
72f4b7251f
|
修改配置
|
2021-05-28 14:29:37 +08:00 |
|
|
|
fcfa90fd64
|
Merge remote-tracking branch 'origin/uat'
|
2021-05-28 14:21:16 +08:00 |
|
|
|
0c7d019a6b
|
修改skywalking配置
|
2021-05-28 10:02:39 +08:00 |
|
|
|
bd9af4a277
|
修改skywalking配置
|
2021-05-28 09:46:55 +08:00 |
|
|
|
3da588dd86
|
1.日志挂载路径修改
2.就绪检测与存活检测规则修改
|
2021-05-27 18:00:32 +08:00 |
|
|
|
1a1620ebea
|
修改字段名
|
2021-05-27 09:14:40 +08:00 |
|
|
|
2a76ac6e74
|
添加apollo
|
2021-05-25 16:28:24 +08:00 |
|
|
|
11720fe103
|
添加apollo
|
2021-05-25 16:06:07 +08:00 |
|
|
|
8c479079ef
|
Merge branch 'uat' into dev
# Conflicts:
# src/main/java/com/chinaunicom/mall/ebtp/extend/BizServiceEbtpExtendApplication.java
# src/main/java/com/chinaunicom/mall/ebtp/extend/export/service/impl/ZjcnExportServiceImpl.java
# src/main/resources/application.yml
|
2021-05-25 16:05:16 +08:00 |
|
|
|
b09f0e2f35
|
添加apollo
|
2021-05-25 16:00:11 +08:00 |
|
|
|
008a108a95
|
添加apollo
|
2021-05-25 15:59:28 +08:00 |
|
|
|
a9dc1f24dc
|
添加apollo
|
2021-05-25 15:57:11 +08:00 |
|
|
|
97f35d9d91
|
Merge branch 'master' into uat
# Conflicts:
# src/main/resources/application.yml
|
2021-05-25 15:55:54 +08:00 |
|
|
|
8c3114cca7
|
添加apollo
|
2021-05-25 15:52:20 +08:00 |
|
|
|
6718acb3c5
|
Merge remote-tracking branch 'origin/pro'
|
2021-05-25 15:28:07 +08:00 |
|
|
|
131b3780eb
|
注册 UAT Skywalking
修改logback
|
2021-05-18 09:43:02 +08:00 |
|
|
|
b51f6eed90
|
添加CPU内存资源限制，防止服务部署异常
|
2021-05-15 14:22:51 +08:00 |
|
|
|
fab63c6ba7
|
共享文档重构
|
2021-05-14 08:57:02 +08:00 |
|
|
|
ce4e9319e4
|
修改feign接口调用
|
2021-05-12 15:05:39 +08:00 |
|
|
|
824d346434
|
重构 文档下载
|
2021-05-11 09:06:04 +08:00 |
|
|
|
5614b2533c
|
重构 文档下载
|
2021-05-10 11:04:31 +08:00 |
|
|
|
514dbd25ac
|
dev环境还原
|
2021-05-07 14:46:11 +08:00 |
|
|
|
c5001583af
|
Update application-test.yml
|
2021-05-06 15:11:16 +08:00 |
|
|
|
fd407370d2
|
Update application-test.yml
|
2021-05-06 15:08:45 +08:00 |
|
|
|
dd8aebc500
|
dev环境改成uat的数据库链接
|
2021-05-06 14:50:17 +08:00 |
|
|
|
17f2bc2e79
|
删除类
|
2021-05-06 14:48:14 +08:00 |
|
|
|
ec40ae4825
|
删除类
|
2021-05-06 14:46:16 +08:00 |
|
|
|
d5bc2ec5a7
|
Merge remote-tracking branch 'origin/export' into dev
# Conflicts:
# src/main/java/com/chinaunicom/mall/ebtp/extend/export/service/impl/BizExportDictServiceImpl.java
# src/main/java/com/chinaunicom/mall/ebtp/extend/templatewarehouse/controller/TemplateWarehouseController.java
# src/main/java/com/chinaunicom/mall/ebtp/extend/templatewarehouse/dao/mapper/BizBidClientVersionMapper.xml
# src/main/java/com/chinaunicom/mall/ebtp/extend/templatewarehouse/entity/BizBidClientVersion.java
# src/main/java/com/chinaunicom/mall/ebtp/extend/timeService/controller/TimeServiceController.java
|
2021-05-06 14:44:37 +08:00 |
|
