Commit Graph

233 Commits

Author SHA1 Message Date
9fe6eace74 增加业务参数 2021-08-04 17:06:27 +08:00
69815abcc5 增加业务参数 2021-08-04 16:54:53 +08:00
0062bd7dec 增加业务参数 2021-08-04 16:41:41 +08:00
82de945f59 增加业务参数 2021-08-04 16:07:20 +08:00
78d27c5607 增加数据类别字段 2021-08-04 14:33:27 +08:00
4f96dc9306 增加数据类别字段 2021-08-04 14:27:45 +08:00
a6fdc14c80 增加数据类别字段 2021-08-04 13:50:32 +08:00
49d42583bb 增加数据类别字段 2021-08-04 11:25:29 +08:00
4626a00084 Merge branch 'dev' into uat 2021-08-04 11:16:27 +08:00
2318de6deb 增加数据类别字段 2021-08-04 11:13:49 +08:00
5a941b83ad 增加数据类别字段 2021-08-04 10:13:43 +08:00
7189b44f5c Merge branch 'dev' into 'uat'
修改日志挂载路径

See merge request eshop/biz_service_ebtp_extend!52
2021-08-02 10:37:09 +08:00
2d2eeb2f05 修改日志挂载路径 2021-08-02 10:15:24 +08:00
86f1afc740 Merge branch 'dev' into 'uat'
Dev

See merge request eshop/biz_service_ebtp_extend!51
2021-08-02 09:40:35 +08:00
2f9fc4116b 修改日志挂载路径 2021-08-02 09:24:29 +08:00
091ea9dd82 时间戳服务BUG修复 2021-07-16 14:53:37 +08:00
192d0a5589 时间戳服务BUG修复 2021-07-16 14:41:00 +08:00
0817ae7958 Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
#	src/main/java/com/chinaunicom/mall/ebtp/extend/timeService/TimeServiceConstant.java
2021-07-16 14:39:46 +08:00
02c5934cc9 时间戳服务BUG修复 2021-07-16 14:38:35 +08:00
2b87f68cbe Merge branch 'dev' into 'uat'
Dev

See merge request eshop/biz_service_ebtp_extend!50
2021-07-09 09:50:01 +08:00
8af1e9d4b4 修改post方式 2021-07-09 09:48:14 +08:00
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
yss
d2dd2ae97e Merge branch 'master-password' into uat 2021-06-17 09:58:24 +08:00
yss
f07eed422c Merge branch 'master-password' into dev 2021-06-15 16:46:51 +08:00
yss
ba7ccc4fd8 平台密码 2021-06-15 16:46:20 +08:00
yss
f5ba7df73f Merge branch 'master-password' into dev 2021-06-15 16:40:49 +08:00
yss
6ebd72bd55 平台密码 2021-06-15 16:40:19 +08:00
yss
aab03cb862 Merge branch 'master-password' into dev 2021-06-15 16:02:55 +08:00
yss
d405d4d10f 平台密码 2021-06-15 16:02:18 +08:00
yss
60adc738a0 Merge branch 'master-password' into dev 2021-06-15 14:54:17 +08:00
yss
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