Commit Graph

273 Commits

Author SHA1 Message Date
2ff0204497 Merge branch 'uat' into sim 2021-08-13 13:44:48 +08:00
ed85aa6aef 信息详情增加业务参数 2021-08-11 10:31:41 +08:00
5c87824c45 已阅 2021-08-10 16:33:09 +08:00
83568accad 已阅 2021-08-10 16:27:49 +08:00
4129aa947c 已阅 2021-08-10 16:00:49 +08:00
403ce0e4ea 已阅 2021-08-10 14:15:57 +08:00
6c1da27a07 增加业务参数 2021-08-10 14:01:23 +08:00
045546b340 增加业务参数 2021-08-10 13:56:20 +08:00
164210d1c8 增加业务参数 2021-08-10 09:55:02 +08:00
fa2df9fcf3 增加业务参数 2021-08-10 08:56:49 +08:00
bae2583d4c 增加业务参数 2021-08-09 17:12:21 +08:00
1cfbac87c4 增加业务参数 2021-08-05 09:25:11 +08:00
23dea9cf5c 增加业务参数 2021-08-05 09:08:59 +08:00
ceadca6dad 增加业务参数 2021-08-05 08:46:07 +08:00
4b3d45e855 增加业务参数 2021-08-04 17:09:37 +08:00
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
73d2d2e807 添加配置 2021-08-04 13:59:01 +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
ecdd3fb826 Merge branch 'uat' into sim
# Conflicts:
#	src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/controller/BizMessageConsumerController.java
#	src/main/java/com/chinaunicom/mall/ebtp/extend/timeService/TimeServiceConstant.java
#	src/main/java/com/chinaunicom/mall/ebtp/extend/timeService/controller/TimeServiceController.java
2021-08-03 09:26:09 +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
80e7867b24 时间戳服务BUG修复 2021-07-16 15:04:01 +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
4f3863f36c 时间戳服务BUG修复 2021-07-16 14:22:05 +08:00
c0db0332e7 时间戳服务BUG修复 2021-07-16 14:13:40 +08:00
1d64577634 修改post 2021-07-16 11:32:32 +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
ede5432bbb Merge branch 'master' into 'sim'
Master

See merge request eshop/biz_service_ebtp_extend!49
2021-06-30 14:56:03 +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
e15d0a7c06 Merge branch 'master-password' into 'master'
Master password

See merge request eshop/biz_service_ebtp_extend!46
2021-06-18 08:41:40 +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