|
05bc20591b
|
jasypt
|
2022-09-23 14:55:53 +00:00 |
|
|
56d6a333da
|
修改local的配置文件
|
2022-06-30 14:51:27 +08:00 |
|
|
fcb9535208
|
修改local的配置文件
|
2022-06-30 10:14:33 +08:00 |
|
|
f0e414713c
|
解决报表打印bug
|
2022-05-20 08:38:01 +08:00 |
|
|
863e3678e4
|
【生产】报表打印-评审报告中评审结果排序问题、报价等字段去掉小数点
|
2022-01-13 09:33:41 +08:00 |
|
|
739ba6d06d
|
Merge remote-tracking branch 'remotes/origin/uat' into dev
# Conflicts:
# pom.xml
|
2021-11-12 09:48:26 +08:00 |
|
|
02031a2bf1
|
Merge branch 'uat' into sim
|
2021-09-29 16:09:58 +08:00 |
|
|
3a65d04c83
|
发送短信接口
|
2021-09-24 13:40:59 +08:00 |
|
|
168e309ea3
|
Merge remote-tracking branch 'remotes/origin/dev' into dev_sendMsg
# Conflicts:
# pom.xml
# src/main/java/com/chinaunicom/mall/ebtp/extend/BizServiceEbtpExtendApplication.java
# src/main/resources/application-local.yml
|
2021-09-18 08:50:41 +08:00 |
|
|
7be724f71a
|
定时任务测试
|
2021-09-17 14:10:48 +08:00 |
|
|
a904822322
|
Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
# pom.xml
|
2021-09-17 13:38:31 +08:00 |
|
|
19ceaf20d9
|
定时任务测试
|
2021-09-17 13:37:51 +08:00 |
|
|
1ffcb167f9
|
区块链修改为生产环境配置
|
2021-09-14 11:23:48 +08:00 |
|
|
8703cde5a0
|
Merge branch 'dev' into uat
|
2021-09-02 18:30:04 +08:00 |
|
|
6edd9a309e
|
区块链调试
|
2021-09-02 15:46:38 +08:00 |
|
|
5744420b84
|
增加风险管控配置地址
|
2021-08-26 12:32:45 +08:00 |
|
|
525b100dc8
|
Merge branch 'uat' into 'sim'
Uat
See merge request eshop/biz_service_ebtp_extend!59
|
2021-08-26 08:40:22 +08:00 |
|
|
7d4c91c2e2
|
添加字体库设置
|
2021-08-23 15:21:44 +08:00 |
|
|
f6489c7062
|
新增专家签名导出pdf
|
2021-08-20 15:50:02 +08:00 |
|
|
73d2d2e807
|
添加配置
|
2021-08-04 13:59:01 +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 |
|
|
c1a875c3a1
|
发送短信测试
|
2021-06-25 09:50:06 +08:00 |
|
|
c725e6ea72
|
发送短信测试
|
2021-06-23 16:11:36 +08:00 |
|
|
b20ab0ff33
|
Merge branch 'master' into sim
# Conflicts:
# src/main/resources/application.yml
|
2021-05-27 09:05:35 +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 |
|
|
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 |
|
|
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 |
|
|
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 |
|
|
ddd2f1fa80
|
重构 报表打印
|
2021-04-28 09:50:54 +08:00 |
|
|
aa59e599ad
|
Merge branch 'master' into pro
# Conflicts:
# src/main/resources/logback.xml
|
2021-04-23 16:58:08 +08:00 |
|
|
4103d833cc
|
Update logback.xml
|
2021-04-22 14:43:19 +08:00 |
|
|
8a7a4dae15
|
统一日志输出
|
2021-04-22 14:19:45 +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 |
|