Commit Graph

784 Commits

Author SHA1 Message Date
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
35aa2ac342 发送邮件测试 2021-06-28 10:08:48 +08:00
46678428bf 发送邮件测试 2021-06-28 09:07:08 +08:00
c1a875c3a1 发送短信测试 2021-06-25 09:50:06 +08:00
c725e6ea72 发送短信测试 2021-06-23 16:11:36 +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
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
1a1620ebea 修改字段名 2021-05-27 09:14:40 +08:00
b20ab0ff33 Merge branch 'master' into sim
# Conflicts:
#	src/main/resources/application.yml
2021-05-27 09:05:35 +08:00
cfc46b12eb 将shardingjdbc健康监测代码移动到脚手架 2021-05-26 23:28:15 +08:00
2230ec9549 调试shardingjdbc的健康监测 2021-05-26 23:23:04 +08:00
0366b47cdf Update application-sim.yml 2021-05-26 23:12:42 +08:00
203aff8355 Update application-sim.yml 2021-05-26 22:41:57 +08:00
6699dee8c1 Update application-sim.yml 2021-05-26 22:30:03 +08:00
8a7f1b4598 Update application-sim.yml 2021-05-26 22:26:33 +08:00
570e9beeb5 Update application-sim.yml 2021-05-26 22:23:05 +08:00
384fdd67b7 Update application-sim.yml 2021-05-26 22:19:58 +08:00
4a5e3cb897 Update application-sim.yml 2021-05-26 21:55:43 +08:00
95d75ea89f Update application-sim.yml 2021-05-26 21:50:01 +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
4fe1d2814b Update application-sim.yml 2021-05-14 14:44:23 +08:00
8e85fbc2fd 修改sim配置文件 2021-05-14 09:28:23 +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