Commit Graph

64 Commits

Author SHA1 Message Date
zengwei eb0b30fbed 文件接口修改
Former-commit-id: 9026022b491e97fb5ac9cf4355bee91a3de00329
2021-03-31 16:24:47 +08:00
zengwei fd04daac77 Merge branch 'master' of https://git.trustie.net/moshenglv/share
Former-commit-id: 8d7a24adba504194ab71a7da6caf741e0af97e0d
2021-03-31 15:58:43 +08:00
zengwei 982165f377 合并冲突
Former-commit-id: 010d54c6112ca8331c30f5343ca4afbdde150463
2021-03-31 15:58:31 +08:00
victor f88e70119b test
Former-commit-id: ab45aa968873b2b2adfde8548dbce6380a00e463
2021-03-31 15:55:02 +08:00
zengwei fef23ef2ae 文件接口修改
Former-commit-id: fb2251d5f3b15bb0fc4922c9de1ca2fbae118c17
2021-03-31 15:54:29 +08:00
victor b3b12ce34a 资源库
Former-commit-id: 86df2319a6ca90039b584b59e44a8fe25999d5ee
2021-03-31 15:48:32 +08:00
victor 8a9f471b9f Merge branch 'master' of https://git.trustie.net/moshenglv/share into master
Former-commit-id: 26c51b4773b99853348b1df2fd16701636426424
2021-03-31 09:45:15 +08:00
victor 30e52e5227 页面
Former-commit-id: 91dd3efe9574914fc9af14802bcba01ae985f879
2021-03-31 09:45:01 +08:00
zengwei 53f2ff7ff7 添加日志
Former-commit-id: 2989c4a1ef6d87cfdc08dbc650bf734eda9d2321
2021-03-31 09:32:20 +08:00
zengwei cafa5270bd Merge branch 'master' of https://git.trustie.net/moshenglv/share
Former-commit-id: 214c056c4be433885fa85f1fd20f24c88b724744
2021-03-30 16:36:47 +08:00
zengwei 426da27981 修改文件上传接口
Former-commit-id: 93678288a6dcf35bb8b47af21c61f910a51fa620
2021-03-30 16:36:23 +08:00
victor dca16945ae Merge branch 'master' of https://git.trustie.net/moshenglv/share into master
Former-commit-id: 9b7c3647e5c8f2183028341859fba01adef919ed
2021-03-30 15:57:51 +08:00
victor 6287bd7fca test
Former-commit-id: ba8dd2e0c988b6d8741f7fed540bd4630835f10a
2021-03-30 15:57:41 +08:00
victor 8f412bdeb9 test
Former-commit-id: 05092351ba248196d8ec5508fd709f857ab4f110
2021-03-30 15:57:25 +08:00
zengwei 1a675dc45c 更新文件上传接口
Former-commit-id: 8ede84458900f89498b5b558f803d2084877d6f9
2021-03-30 15:45:04 +08:00
victor 5ba05bb26d 登录
Former-commit-id: 3f96a1adf484883a9dfd1e3d3364b09929c25e25
2021-03-30 12:37:07 +08:00
victor 624cccb15f 页面
Former-commit-id: c4f114bbcdc956f62b2d9790661770840a01cacf
2021-03-30 09:14:39 +08:00
victor 921b42ecba 页面
Former-commit-id: c1ee8d6e45721f591c629756bdf6fd7686e162bb
2021-03-29 20:22:11 +08:00
victor 31707c0379 Merge branch 'master' of https://git.trustie.net/moshenglv/share into master
Former-commit-id: 445350d9aa970b456616f015ce6d5c0a2512401a
2021-03-29 20:03:20 +08:00
victor 84d825610f 前端
Former-commit-id: f2a424e9b07daedd9671efd5b42af2450042002e
2021-03-29 20:03:12 +08:00
zengwei da4ec6da0d 修改配置
Former-commit-id: f370a86481a6a46d1ce5ea88714e0cb4a4ed2401
2021-03-29 17:53:06 +08:00
zengwei a3f7a2e9c7 修改文件类型
Former-commit-id: f41ed89b284598e03b720a64c4ce1532112a393b
2021-03-29 13:54:37 +08:00
zengwei 3a63531eec 修改文件接口
Former-commit-id: f7b7ff4e6fb151bb589111de072db15b4f16d94f
2021-03-29 13:21:59 +08:00
zengwei e22d83a97d Merge branch 'master' of https://git.trustie.net/moshenglv/share
Former-commit-id: dd5dc21e0a4079d64604ffb581a95b589cb542f0
2021-03-29 12:39:57 +08:00
zengwei 86d7b77cf6 修改成果接口
Former-commit-id: d70bbe01e75dc0c4cd9ad3e4dbf3c59d4b070c40
2021-03-29 12:39:45 +08:00
victor 5d7ba59d1a Merge branch 'master' of https://git.trustie.net/moshenglv/share into master
Former-commit-id: 3fd7b4ad2ae26283efb1e7c7c6ed03d947461aff
2021-03-29 12:32:26 +08:00
victor c44efd4574 定时刷新状态
Former-commit-id: 61f896fb4d14527222b16ef36fb968ceaf4e3bff
2021-03-29 12:32:14 +08:00
zengwei 6c24e542e8 成果接口修改
Former-commit-id: 1c188a1500207e061f3d37fccb12d33c8d20d897
2021-03-29 12:24:28 +08:00
zengwei 1d9fe54e7d 修改成果接口
Former-commit-id: 8501a4422c5bc5882b8d2b59bec62f19795dde40
2021-03-29 09:19:36 +08:00
victor 39d128cebf 前端
Former-commit-id: 05314892dd420d033a02642919d8bfcb8991b80b
2021-03-27 11:27:12 +08:00
victor 4a07526514 Merge branch 'master' of https://git.trustie.net/moshenglv/share into master
Former-commit-id: d97325973c859ff20d4e7bf9a60b9d3165fa179c
2021-03-27 08:53:25 +08:00
victor 7aad6ec329 共享cookie
Former-commit-id: 60cf5176708c2998b1d62549bc32615d9671aabc
2021-03-27 08:53:18 +08:00
zengwei 3a62bb7aed 修改文件接口
Former-commit-id: 0f2fb3afe3b96f933e43e99eea31b623332fe7c3
2021-03-26 14:06:20 +08:00
victor defcf5621d 需求管理
Former-commit-id: 32b4470e0b04297f038ed8ae5fb1db6dab64b8e8
2021-03-25 20:04:07 +08:00
victor 932dae6e50 Merge branch 'master' of https://git.trustie.net/moshenglv/share into master
Former-commit-id: 6c457c3c62fb252f3e8ec0c8e9e77570c81428e3
2021-03-25 19:32:09 +08:00
victor d3a3ca2e02 查询用户
Former-commit-id: 48ab172e0cd40480b0cf3e40392afb0328a1500f
2021-03-25 19:32:03 +08:00
zengwei e1454ba523 修改成果接口
Former-commit-id: 97ea58e29bb595b4713d91dd97f5b9533bf37719
2021-03-25 18:42:58 +08:00
victor 8c4ae8cc32 需求管理接口
Former-commit-id: fafe573abd0c3ac35875961e0fb156df50cf4314
2021-03-25 18:03:50 +08:00
zengwei 41300d6c7a 修改成果接口
Former-commit-id: 11d712628581a03748de0f455a8839bf4d82c929
2021-03-25 16:16:35 +08:00
zengwei ae84325e18 Merge branch 'master' of https://git.trustie.net/moshenglv/share
Former-commit-id: afd011498ffcaf5a9d4c7968ea8f8dd5818ba66b
2021-03-25 15:40:01 +08:00
zengwei 9430a5e0b8 修改文件上传接口
Former-commit-id: e7dc221fca5a3d060b04d70790f84093d13733d8
2021-03-25 15:37:21 +08:00
victor 4df97e9a71 需求管理
Former-commit-id: 91255a672b2a8dcea87288dbe16a592b4ea642d4
2021-03-25 14:47:15 +08:00
victor 0784f558d6 Merge branch 'master' of https://git.trustie.net/moshenglv/share into master
Former-commit-id: ad55eb6b038e6d40f8ae7d75ef2b0838b4ebd12c
2021-03-25 13:57:56 +08:00
victor a8066e8b83 用户权限控制
Former-commit-id: d7cb52fed55b6082b6e43ebd8d1b72a75fc60de4
2021-03-25 13:57:47 +08:00
zengwei 5bb4ca808a 修改成果接口
Former-commit-id: 45d2cf24ec16a8a7af2550e8f5d3f3de36cf7425
2021-03-24 17:47:13 +08:00
zengwei 5dbb292176 修改文件接口
Former-commit-id: 6f699572f0f0b9c34d4ae6b11e95494a366beadd
2021-03-24 15:43:39 +08:00
zengwei b65db21f1f Merge branch 'master' of https://git.trustie.net/moshenglv/share
Former-commit-id: db4488d16a28baea5246ef8a48656f527910dba8
2021-03-24 13:29:59 +08:00
zengwei 7ad1719b35 修改文件上传配置
Former-commit-id: f167f1bad19bf2bb3ab2e9136e81f1b10f1db6e5
2021-03-24 13:29:36 +08:00
victor 78228ca044 需求管理接口
Former-commit-id: f2466b9656a8a7e1de8a88dfb765f170e03227fc
2021-03-24 11:01:36 +08:00
zengwei f95deafe4f 修改成果接口
Former-commit-id: 06ca9f2a8f20dfe5d9a5826bae557a60c3a214a5
2021-03-24 09:55:40 +08:00