Commit Graph

154 Commits

Author SHA1 Message Date
8af1e9d4b4 修改post方式 2021-07-09 09:48:14 +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
ba7ccc4fd8 平台密码 2021-06-15 16:46:20 +08:00
yss
6ebd72bd55 平台密码 2021-06-15 16:40:19 +08:00
yss
d405d4d10f 平台密码 2021-06-15 16:02:18 +08:00
yss
6481d1b436 平台密码 2021-06-15 14:53:46 +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
e0d1ddd9d1 修改共享文档查询条件 2021-06-08 14:14:56 +08:00
ace383a37c Merge branch 'master-shared' into uat 2021-06-05 11:34:15 +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
1a1620ebea 修改字段名 2021-05-27 09:14:40 +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
008a108a95 添加apollo 2021-05-25 15:59:28 +08:00
a9dc1f24dc 添加apollo 2021-05-25 15:57:11 +08:00
8c3114cca7 添加apollo 2021-05-25 15:52:20 +08:00
131b3780eb 注册 UAT Skywalking
修改logback
2021-05-18 09:43:02 +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
c8568ea6b7 重构 报表打印 2021-04-30 10:06:21 +08:00
ab3ac03120 修改报表打印-评委打分表 2021-04-29 09:40:52 +08:00
ddd2f1fa80 重构 报表打印 2021-04-28 09:50:54 +08:00
014f2cd942 Merge branch 'dev' into 'master'
修改实体bug

See merge request eshop/biz_service_ebtp_extend!38
2021-04-25 16:35:30 +08:00
f4a02562d5 修改实体bug 2021-04-25 16:33:02 +08:00
d436db8555 Merge branch 'dev' into 'master'
修改实体bug

See merge request eshop/biz_service_ebtp_extend!36
2021-04-25 16:24:52 +08:00
d8a0669919 修改实体bug 2021-04-25 16:24:32 +08:00
1aee6195e4 Merge branch 'dev' into 'master'
重构开标一览表

See merge request eshop/biz_service_ebtp_extend!34
2021-04-23 16:54:35 +08:00
9bd070550c 重构开标一览表 2021-04-23 16:54:04 +08:00
0f400a10af Merge branch 'dev' into 'master'
修改实体

See merge request eshop/biz_service_ebtp_extend!33
2021-04-21 16:07:17 +08:00
949c548896 修改实体 2021-04-21 16:06:17 +08:00
114557eee4 Merge branch 'dev' into 'master'
新增接口,查询最低最高版本号

See merge request eshop/biz_service_ebtp_extend!32
2021-04-21 15:56:14 +08:00
40042d3b78 新增接口,查询最低最高版本号 2021-04-21 15:55:09 +08:00
81aa01b3ea Update logback.xml 2021-04-13 09:54:09 +08:00
82b602d885 Update logback.xml 2021-04-13 09:47:30 +08:00
83044f0ac3 Merge branch 'dev' into 'master'
时间戳服务器修改

See merge request eshop/biz_service_ebtp_extend!29
2021-04-13 09:45:48 +08:00
be11afa86f 时间戳服务BUG修复 2021-04-13 09:35:39 +08:00
c8b3d5cbcd 修改配置文件 2021-04-12 17:25:00 +08:00
042f4699b1 Update application-uat.yml 2021-04-12 17:18:53 +08:00