Commit Graph

19 Commits

Author SHA1 Message Date
Bob b8cdaf466b Merge branch 'master' of http://210.77.77.77/xieshen/newmediamonitoring
# Conflicts:
#	NewMediaMonitoring/urls.py
2020-09-18 14:42:55 +08:00
Bob 6d313c3d22 Merge branch 'master' of http://210.77.77.77/xieshen/newmediamonitoring
# Conflicts:
#	NewMediaMonitoring/urls.py
2020-09-18 10:13:55 +08:00
baoliang c440f1f509 add department/post to userprofile 2020-09-17 16:23:27 +08:00
Bob ce4200e9a3 #管理 2020-09-17 16:10:13 +08:00
Bob accbbc42f1 #test 2020-09-13 17:30:46 +08:00
Bob 6bca33946e #test 2020-09-13 14:20:15 +08:00
Bob 83d738f489 #test 2020-09-13 14:06:21 +08:00
baoliang 9a51ff4ea5 change new media model 2020-09-11 12:27:32 +08:00
baoliang fe8e63df7a add media 2020-09-04 22:42:41 +08:00
baoliang 85a8b0f96e modify userprofile 2020-09-03 17:46:04 +08:00
xieshen de079fade2 fix deloy 2020-09-03 10:55:44 +08:00
Bob ccf4574212 #用户登录、数据库修改 2020-08-26 09:58:16 +08:00
Bob 1aabd1a5c6 #用户登录、数据库修改 2020-08-23 12:06:04 +08:00
wsf fd3520c736 fixed untracked files 2020-08-20 15:38:42 +08:00
Bob c1497188fa #新媒体管理 2020-08-19 10:35:55 +08:00
Bob fd293ce05c #新媒体管理 2020-08-17 18:23:42 +08:00
Bob fbd99ad1d3 #单位管理,群组管理,用户管理 2020-08-13 17:55:52 +08:00
Bob 5e6577bada #create 2020-07-27 17:38:53 +08:00
Bob c53871d9fe #create 2020-07-24 11:01:32 +08:00