|
fadaabd85b
|
Merge branch 'master' into pro
|
2021-03-29 17:55:33 +08:00 |
|
|
f68dd8ec26
|
Merge branch 'dev'
|
2021-03-29 17:54:22 +08:00 |
|
|
b6948f5338
|
处理用友如果异常方法增加seata标签报错问题
|
2021-03-29 16:56:33 +08:00 |
|
|
77ec13c8ae
|
解决异常处理复制项目信息时间不进行复制bug
|
2021-03-29 16:48:30 +08:00 |
|
|
68eb28167f
|
过滤查询条件为空的数据
|
2021-03-29 13:40:56 +08:00 |
|
|
2681955dc0
|
Merge branch 'master' into 'pro'
增加供应商id不能为空校验修改提示信息
See merge request eshop/biz_service_ebtp_project!30
|
2021-03-28 19:08:19 +08:00 |
|
|
b471d05e79
|
Merge branch 'dev' into 'master'
增加供应商id不能为空校验修改提示信息
See merge request eshop/biz_service_ebtp_project!29
|
2021-03-28 19:07:26 +08:00 |
|
|
1166b8f1c6
|
增加供应商id不能为空校验修改提示信息
|
2021-03-28 19:05:47 +08:00 |
|
|
ddccf9a14d
|
Merge branch 'dev' into 'master'
修改事务时间
See merge request eshop/biz_service_ebtp_project!28
|
2021-03-27 15:17:42 +08:00 |
|
|
a4f33281f9
|
修改事务时间
|
2021-03-27 15:16:31 +08:00 |
|
|
6c4516abdd
|
Merge branch 'master' into 'pro'
修改正式环境redis配置文件
See merge request eshop/biz_service_ebtp_project!27
|
2021-03-26 11:20:14 +08:00 |
|
|
13b2cb3f2e
|
Merge branch 'dev' into 'master'
修改正式环境redis配置文件
See merge request eshop/biz_service_ebtp_project!26
|
2021-03-26 11:19:58 +08:00 |
|
|
0a126aa3f9
|
修改正式环境redis配置文件
|
2021-03-26 11:18:37 +08:00 |
|
|
c792f5f027
|
Merge branch 'master' into 'pro'
修改配置文件
See merge request eshop/biz_service_ebtp_project!25
|
2021-03-25 15:14:22 +08:00 |
|
|
b74e3f919c
|
Merge branch 'dev' into 'master'
修改配置文件
See merge request eshop/biz_service_ebtp_project!24
|
2021-03-25 15:13:59 +08:00 |
|
|
3b72edf8a6
|
修改配置文件
|
2021-03-25 15:12:27 +08:00 |
|
|
eb004e56a5
|
Merge branch 'dev' into 'master'
1、修改异常处理发布才能选择的标段过滤bug
See merge request eshop/biz_service_ebtp_project!23
|
2021-03-25 13:10:32 +08:00 |
|
|
1b6230312b
|
1、修改异常处理发布才能选择的标段过滤bug
|
2021-03-25 13:09:41 +08:00 |
|
|
6125078dbd
|
Merge branch 'dev' into 'master'
1、增加异常处理发布才能选择的标段过滤
See merge request eshop/biz_service_ebtp_project!22
|
2021-03-25 12:31:37 +08:00 |
|
|
266d528c0a
|
1、增加异常处理发布才能选择的标段过滤
|
2021-03-25 12:30:52 +08:00 |
|
|
be1d748d29
|
Merge branch 'master' into 'pro'
正式环境合并
See merge request eshop/biz_service_ebtp_project!21
|
2021-03-25 10:15:38 +08:00 |
|
|
79ec1a4e4b
|
Merge branch 'dev' into 'master'
1、增加日志输出
See merge request eshop/biz_service_ebtp_project!20
|
2021-03-25 10:14:05 +08:00 |
|
|
26561979a0
|
1、增加日志输出
|
2021-03-25 09:48:28 +08:00 |
|
|
c1527c9b9e
|
Merge branch 'dev' into 'master'
1、修改项目是否用ipass进行制作应答文件
See merge request eshop/biz_service_ebtp_project!19
|
2021-03-25 09:14:19 +08:00 |
|
|
fd5ec97e71
|
1、修改项目是否用ipass进行制作应答文件
|
2021-03-25 09:11:39 +08:00 |
|
|
5a88603778
|
Merge branch 'dev' into 'master'
关闭debugger日志
See merge request eshop/biz_service_ebtp_project!18
|
2021-03-24 15:58:39 +08:00 |
|
|
056da8ed61
|
1、关闭mybatis日志信息
|
2021-03-24 15:57:40 +08:00 |
|
|
7a106b1a76
|
Merge branch 'master' into 'dev'
Master
See merge request eshop/biz_service_ebtp_project!17
|
2021-03-24 11:12:09 +08:00 |
|
|
d16a7af391
|
1、清除日志信息
|
2021-03-24 10:56:18 +08:00 |
|
|
0ec6598b82
|
Merge branch 'dev' into 'master'
修改查询用户信息接口形式
See merge request eshop/biz_service_ebtp_project!16
|
2021-03-23 20:23:25 +08:00 |
|
|
c33087fa5f
|
Merge remote-tracking branch 'origin/dev' into dev
|
2021-03-23 20:20:42 +08:00 |
|
|
54981e39dd
|
1、查询用户去掉链接
|
2021-03-23 20:20:35 +08:00 |
|
|
9722e78831
|
修改k8s部署文件
|
2021-03-23 17:40:48 +08:00 |
|
|
bdee612a25
|
Merge branch 'dev' into 'master'
请求方式修改
See merge request eshop/biz_service_ebtp_project!15
|
2021-03-23 16:05:51 +08:00 |
|
|
7efb907b0d
|
1、重评请求方式修改
|
2021-03-23 16:04:16 +08:00 |
|
|
e9ac3f375a
|
1、重评提示信息修改
|
2021-03-23 10:48:04 +08:00 |
|
|
96e1fb6273
|
Merge branch 'dev' into 'master'
1、增加采购经理查看分页
See merge request eshop/biz_service_ebtp_project!14
|
2021-03-23 08:35:01 +08:00 |
|
|
219d5e2329
|
1、增加采购经理查看分页
|
2021-03-22 19:47:31 +08:00 |
|
|
535cc57f7b
|
Merge branch 'dev' into 'master'
增加权限
See merge request eshop/biz_service_ebtp_project!13
|
2021-03-22 16:16:08 +08:00 |
|
|
b07b8ac2d7
|
Merge branch 'dev_pre' into 'dev'
分支合并
See merge request eshop/biz_service_ebtp_project!12
|
2021-03-22 16:15:17 +08:00 |
|
|
259bae41c7
|
Merge branch '210320' into 'dev_pre'
210320
See merge request eshop/biz_service_ebtp_project!10
|
2021-03-20 09:47:58 +08:00 |
|
|
6f13b6a6c5
|
1、增加权限字
2、异常处理标段设置成归档
|
2021-03-19 15:48:25 +08:00 |
|
|
4dc91aeac7
|
Merge branch 'dev' into 'master'
合并分支 重评增加查询接口和项目金额统计
See merge request eshop/biz_service_ebtp_project!9
|
2021-03-19 08:53:16 +08:00 |
|
|
a970f6fe33
|
重新评审更换参数传递形式
|
2021-03-18 16:06:35 +08:00 |
|
|
0fd01d6bfd
|
重新评审更换参数传递形式
|
2021-03-18 14:20:56 +08:00 |
|
|
bb8dc5426b
|
Merge remote-tracking branch 'origin/dev' into dev
|
2021-03-18 14:16:50 +08:00 |
|
|
1601a7540c
|
1、重新评审流程追踪地址获取
2、增加标段金额累计
|
2021-03-18 14:15:44 +08:00 |
|
|
7f98e49f98
|
增加链路追踪和性能监控
|
2021-03-17 10:47:25 +08:00 |
|
|
7720b908c1
|
Merge branch 'dev' into 'master'
1、初始化所属省分字段取值修改
See merge request eshop/biz_service_ebtp_project!8
|
2021-03-16 17:14:56 +08:00 |
|
|
f13a69b22d
|
1、初始化所属省分字段取值修改
|
2021-03-16 17:11:23 +08:00 |
|