Commit Graph

107 Commits (522a1327508f2bb853613c626c3c5357e4544eb6)

Author SHA1 Message Date
chenjinlong 680c697d4b Merge remote-tracking branch 'origin/master' into group2
# Conflicts:
#	src/main/java/cn/stylefeng/guns/modular/login/PositionViewController.java
2020-12-30 17:01:49 +08:00
fengshuonan da60c89600 新增个人信息界面和修改密码界面,待联调接口 2020-12-29 22:33:56 +08:00
chenjinlong 9c18bb4afa 【position】增加职位管理 2020-12-29 21:56:12 +08:00
fengshuonan e2f1c75d3f 更新退出接口 2020-12-29 21:40:41 +08:00
fengshuonan 0de7eee12f 更新工作台和分析页两个界面,更新锁屏界面 2020-12-29 21:38:11 +08:00
fengshuonan 31f9a6ef0f 初步调通登录和首页的界面 2020-12-27 20:00:09 +08:00
fengshuonan 37d23b2830 初始化提交 2020-12-27 16:15:37 +08:00