Commit Graph

29 Commits

Author SHA1 Message Date
3ffb4e0f0e Merge branch 'master-电子评标室-预约管理-liuh' into 'release_electronic_bid_evaluation_room'
8.26 电子评标室 预约管理 liuh

See merge request eshop/fe_service_ebtp_frontend!246
2022-08-26 13:39:18 +08:00
02325fc77f Merge branch '20220804-监控大屏' into 'release_electronic_bid_evaluation_room'
8.26 电子评标室 监控大屏

See merge request eshop/fe_service_ebtp_frontend!247
2022-08-26 13:39:13 +08:00
90d9860fd7 Merge branch 'uat-video-monitor' into 'release_electronic_bid_evaluation_room'
8.26 电子评标室 在线监督 事后监督

See merge request eshop/fe_service_ebtp_frontend!248
2022-08-26 13:39:06 +08:00
28632ac119 Merge branch '20220802-评标室预约情况' of http://10.124.128.2:8888/eshop/fe_service_ebtp_frontend into master-电子评标室-预约管理-liuh 2022-08-25 15:09:43 +08:00
c0e2564b4a 修改路由位置,跳转功能完善 2022-08-25 14:44:05 +08:00
2a69d4531d 8.25 2022-08-25 14:08:06 +08:00
d9459b13bd 设备管理 2022-08-24 15:14:09 +08:00
a7ff7ccd9d 预约评标室 2022-08-11 17:32:15 +08:00
a4d3a36e9a 8.9 2022-08-09 14:17:24 +08:00
cde9e97e96 Merge branch 'master' of http://10.124.128.2:8888/eshop/fe_service_ebtp_frontend into 20220802-评标室预约情况 2022-08-02 17:17:43 +08:00
ca37297a8e 8.2 2022-08-02 17:17:20 +08:00
d0c2deb4c9 8.2 四个路由引用地址大小写错误 2022-08-02 17:14:21 +08:00
04b9f73d3d 7.15 取消富文本组件路由 2022-07-15 11:00:36 +08:00
9ab4413e88 7.15 党建攻坚管理端 2022-07-15 08:58:51 +08:00
c98f3d1a71 Merge branch '20220705-wangeditor' of http://10.124.128.2:8888/eshop/fe_service_ebtp_frontend into 20220712-topic-management 2022-07-13 15:15:59 +08:00
20f092d6b1 7.12 2022-07-12 15:10:29 +08:00
93fc1e3e44 7.5 wangeditor 2022-07-05 21:57:38 +08:00
aaea609833 Merge branch '20220621-PartyMemberTopic' into 'release_20220629'
6.29 党员专题 党建攻坚

See merge request eshop/fe_service_ebtp_frontend!151
2022-06-29 21:31:10 +08:00
15499447aa Merge branch '20220505-物资市场闲置物资-内拍新增功能' into 'release_20220624'
6.24 物资市场闲置物资-内拍新增功能

See merge request eshop/fe_service_ebtp_frontend!136
2022-06-24 21:23:10 +08:00
50b1821242 6.23 党员专题首页 2022-06-23 08:42:54 +08:00
dcc6935304 Merge branch '20220413-zjl-公共服务平台' into 'master-20220527'
5.27 公共服务平台对接

See merge request eshop/fe_service_ebtp_frontend!88
2022-05-27 15:56:46 +08:00
50107faab3 Merge branch '20220413-zjl-公共服务平台' of http://10.124.128.2:8888/eshop/fe_service_ebtp_frontend into 20220505-物资市场闲置物资-内拍新增功能 2022-05-20 14:51:09 +08:00
7c3e7d9ad5 任务【4411】:修改监督项目列表、增加审查项目列表 2022-05-20 13:42:11 +08:00
a5d48fc999 5.16 内拍改造 2022-05-16 16:22:57 +08:00
77e8839ebd 4.22 公共服务平台 2022-04-22 17:04:15 +08:00
a3f9f274b1 3.21 master同步 2022-03-21 13:37:28 +08:00
62f6b07ee2 3.10 工程代码同步master 2022-03-10 14:24:13 +08:00
ff889c3db4 更新版本库 2021-01-16 11:29:42 +08:00
b42e0c1ddd 12-23-上传master 2020-12-23 11:14:35 +08:00