Commit Graph
83 Commits
Author SHA1 Message Date
宋伟佳 2ce8cc68d1 commit 2021-06-10 09:28:12 +08:00
宋伟佳 7e3b7ee6e1 未符合项整改 2021-06-09 17:54:38 +08:00
宋伟佳 7bdf5f6b38 未符合项整改 2021-06-09 17:19:35 +08:00
宋伟佳 d07e1c15de Merge branch 'develop' of http://103.249.252.28:90/LAWS/laws-system-front-FOTON into develop 2021-06-09 13:57:46 +08:00
宋伟佳 afd7d90ec2 标准预警 国内法规详情 2021-06-09 13:57:40 +08:00
zhutianqi ed6a3e2c1d Merge remote-tracking branch 'origin/develop' into develop 2021-06-08 17:57:53 +08:00
zhutianqi 45a9026b2e commit 2021-06-08 17:57:46 +08:00
宋伟佳 a1bf499605 Merge branch 'develop' of http://103.249.252.28:90/LAWS/laws-system-front-FOTON into develop 2021-06-08 10:07:27 +08:00
宋伟佳 5d6ab83c30 标准预警 2021-06-08 10:07:16 +08:00
zhutianqi f24cd9c23f Merge remote-tracking branch 'origin/develop' into develop 2021-06-07 18:00:59 +08:00
zhutianqi 580e33900b commit 2021-06-07 18:00:52 +08:00
宋伟佳 8bedbf1822 标准属性自定义 2021-06-07 10:25:08 +08:00
宋伟佳 5b2169ed24 Merge branch 'develop' of http://103.249.252.28:90/LAWS/laws-system-front-FOTON into develop 2021-06-04 18:02:55 +08:00
宋伟佳 4cbf301ebf 海外标准页面开发 2021-06-04 18:02:40 +08:00
zhutianqi de57b8d2ae Merge remote-tracking branch 'origin/develop' into develop
# Conflicts:
#	src/sysConfig/index.js
2021-06-04 18:02:14 +08:00
zhutianqi 7cc0300099 commit 2021-06-04 18:01:50 +08:00
宋伟佳 af2a58433d 放开海外标准和未符合项 2021-06-04 15:26:18 +08:00
chenxiaoxi 821dec9f88 代码同步 2021-06-04 10:57:24 +08:00
chenxiaoxi 9cc1b16604 代码同步 2021-06-04 10:56:51 +08:00
宋伟佳 a96acfaa1c commit 2021-06-04 10:54:45 +08:00
宋伟佳 dfaa5ddf3e 合并冲突 2021-06-04 09:15:16 +08:00
宋伟佳 0b7920498e commit 2021-06-04 09:14:03 +08:00
zhutianqi a9da09f095 commit 2021-06-03 14:05:13 +08:00
youyuzihan 69176ebed0 update:修正一些bug 2021-06-03 10:35:15 +08:00
宋伟佳 fbf5ccaaae 征求意见详情 2021-06-03 09:28:12 +08:00
宋伟佳 7fe17881fd no message 2021-06-03 09:10:15 +08:00
宋伟佳 43900fcb6e 合并代码 2021-06-03 09:08:30 +08:00
宋伟佳 22ca4cac6d 征求意见 2021-06-03 09:03:49 +08:00
youyuzihan 83c12b74e7 update:保留侧边栏 2021-06-03 08:51:12 +08:00
youyuzihan 6202d04708 update:保留侧边栏 2021-06-03 00:07:26 +08:00
youyuzihan 59d9fc8c7d update:保留侧边栏 2021-06-02 23:42:06 +08:00
zhutianqi 00ad1e9b9b Merge remote-tracking branch 'origin/develop' into develop 2021-06-02 20:24:05 +08:00
zhutianqi a5b05a0e2a commit 2021-06-02 20:23:59 +08:00
宋伟佳 0141af3756 更改背景图片 2021-06-02 17:23:07 +08:00
宋伟佳 af43cda6bb 征求意见详情 2021-06-02 15:57:11 +08:00
宋伟佳 2672fbcc76 合并冲突 2021-06-02 15:46:24 +08:00
宋伟佳 999b0e5ee0 征求意见详情 2021-06-02 15:41:29 +08:00
youyuzihan 6c49ebe058 update:修正界面,等待接口 2021-06-02 15:11:42 +08:00
宋伟佳 0d8824dbcc Merge branch 'develop' of http://103.249.252.28:90/LAWS/laws-system-front-FOTON into develop 2021-06-02 09:05:46 +08:00
宋伟佳 2190495b26 征求意见详情 2021-06-02 09:05:40 +08:00
youyuzihan f66640311c Merge remote-tracking branch 'origin/develop' into develop 2021-06-01 18:04:09 +08:00
youyuzihan 61359419ef update:添加征求管理意见的界面 2021-06-01 18:03:54 +08:00
宋伟佳 aeea384673 Merge branch 'develop' of http://103.249.252.28:90/LAWS/laws-system-front-FOTON into develop 2021-06-01 17:33:30 +08:00
宋伟佳 7a66d83cd0 标准预警 2021-06-01 17:33:25 +08:00
zhutianqi 6c8031eb66 Merge remote-tracking branch 'origin/develop' into develop 2021-06-01 17:02:25 +08:00
zhutianqi bc3252387e commit 2021-06-01 17:02:19 +08:00
宋伟佳 3c7e24db18 征求意见开发 2021-06-01 16:50:24 +08:00
宋伟佳 0277467ba2 Merge branch 'develop' of http://103.249.252.28:90/LAWS/laws-system-front-FOTON into develop 2021-06-01 09:09:30 +08:00
宋伟佳 6ae59aa385 征求意见 2021-06-01 09:09:24 +08:00
zhutianqi 488312ebeb Merge remote-tracking branch 'origin/develop' into develop 2021-05-31 18:03:48 +08:00