Commit Graph

  • *
  • | *
  • | *
  • | |\
  • | |/
  • |/|
  • | *
  • | |\
  • * | |
  • | |/
  • |/|
  • * |
  • | *
  • | *
  • | | *
  • | | *
  • | | *
  • | | |\
  • | |_|/
  • |/| |
  • * | |
  • * | |
  • | | *
  • * | |
  • |\ \ \
  • * | | |
  • | | | *
  • | | | |\
  • | | |_|/
  • | |/| |
  • | * | |
  • |/ / /
  • | | *
  • * | |
  • |\ \ \
  • * | | |
  • | * | |
  • | |\ \ \
  • | |/ / /
  • |/| | |
  • | * | |
  • | | | *
  • | | | *
  • | | | *
  • * | | |
  • |\| | |
  • * | | |
  • | | * |
  • | | |\ \
  • | | |/ /
  • | |/| |
  • | * | |
  • | | | *
  • | * | |
  • | | | *
  • | | |/
  • | |/|
  • | * |
  • |/ /
  • * |
  • * |
  • * |
  • |\ \
  • * | |
  • | * |
  • | |\ \
  • | * | |
  • | | * |
  • | |/ /
  • | * /
  • |/ /
  • * |
  • * |
  • |\ \
  • * | |
  • | * |
  • | * |
  • |/ /
  • * |
  • * |
  • |\ \
  • * | |
  • | * |
  • | |\ \
  • | * | |
  • |/ / /
  • | * /
  • |/ /
  • * |
  • | *
  • | |\
  • | |/
  • |/|
  • * |
  • * |
  • * |
  • * |
  • |\ \
  • * | |
  • | | *
  • | * |
  • | | *
  • | |/
  • | *
  • |/
  • | *
  • | |\
  • | * \
  • | |\ \
  • | |/ /
  • |/| |
  • * | |
  • * | |
  • * | |
  • |\ \ \
  • * | | |
  • | * | |
  • | * | |
  • | * | |
  • |/ / /
  • * | |
  • |\ \ \
  • * | | |
  • | * | |
  • | * | |
  • |/ / /
  • * | |
  • |\ \ \
  • * | | |
  • | * | |
  • | * | |
  • | |\ \ \
  • | |/ / /
  • |/| | |
  • | * | |
  • * | | |
  • |\ \ \ \
  • * | | | |
  • | |/ / /
  • |/| | |
  • | * | |
  • |/ / /
  • * | |
  • |\ \ \
  • * | | |
  • | * | |
  • |/ / /
  • * | |
  • * | |
  • * | |
  • * | |
  • * | |
  • * | |
  • * | |
  • * | |
  • * | |
  • * | |
  • * | |
  • * | |
  • c192347be 【修改】学生选课情况:搜索框增加“选修课程”;列表“上课节次”列格式化时增加判断; by dyy 2020-12-07 18:20:47 +0800
  • 97c5b759a 修改流程表单打印表格数据不显示的问题 by zhichao lei 2020-12-07 15:52:29 +0800
  • 0f81480d5 Merge branch 'master' into 金隅分支 by zhichao lei 2020-12-03 17:03:41 +0800
  • 4700a3f84 Merge commit '031589c39727babdc8f8c298cad7e5d7f5858e45' into 金隅分支 by zhichao lei 2020-12-03 16:47:55 +0800
  • d92928107 挑拣合并测试2 by zhichao lei 2020-12-03 16:44:37 +0800
  • 031589c39 挑拣合并测试1 by zhichao lei 2020-12-03 16:43:50 +0800
  • 8b4e00e0d 移动端选择审核人功能修改 by zhichao lei 2020-12-03 16:24:15 +0800
  • d9988aa24 合同审批单去掉校长审批显示 by zhichao lei 2020-12-03 10:07:42 +0800
  • 16398a30e 打印清单打印显示俩页的问题 by zhichao lei 2020-12-01 15:52:09 +0800
  • 895f440bd 在册登记资产增加打印清单 by zhichao lei 2020-12-01 12:18:11 +0800
  • 13952e4f1 合并 by zhichao lei 2020-11-30 15:35:20 +0800
  • 874a141df 资产方面修改 by zhichao lei 2020-11-30 15:26:54 +0800
  • 2d0636c7c 【增加】移动端“我的"增加”切换账号“; by dyy 2020-11-30 15:23:25 +0800
  • 1cef81234 修改清单内容 by zhichao lei 2020-11-27 17:27:44 +0800
  • c9d65be29 Merge branch 'master' of http://123.57.209.16:3000/bjquanjiang/DigitalScholl by dyy 2020-11-27 15:30:23 +0800
  • aba7c1080 【增加】“学子在线”、“学工信息管理”菜单中增加“学生请假管理”;system配置文件中增加“系主任角色Id”; by dyy 2020-11-27 15:30:06 +0800
  • e1548359e 合并解决冲突 by zhichao lei 2020-11-27 12:24:19 +0800
  • 3809a80c7 1 by zhichao lei 2020-11-27 12:19:04 +0800
  • 97258cd99 打印清单样式修改 by zhichao lei 2020-11-27 09:40:50 +0800
  • 7b631ec23 Merge branch 'master' of 123.57.209.16:bjquanjiang/DigitalScholl by liangkun 2020-11-26 18:30:04 +0800
  • f522b0ef6 修正地址 by liangkun 2020-11-26 18:29:54 +0800
  • c3df0d271 Merge branch 'master' of http://123.57.209.16:3000/bjquanjiang/DigitalScholl by dyy 2020-11-26 18:07:23 +0800
  • 6bc8b8cd1 【修改】学籍信息管理列表增加学生个人信息;学生处分管理增加是否解除处分、解除日期;“学子在线”、“学工信息管理”增加学生课表请假管理; by dyy 2020-11-26 18:07:02 +0800
  • b19a8f004 资产入库出库 调拨 打印清单 by zhichao lei 2020-11-26 16:50:58 +0800
  • c98cb6698 入库 出库 做了开头 by zhichao lei 2020-11-25 14:26:03 +0800
  • 49132f488 【修改】必修课选修课课表同步增加微信推送、飞星推送; by dyy 2020-11-24 18:09:01 +0800
  • ce0ba579d Merge branch 'master' of 123.57.209.16:bjquanjiang/DigitalScholl by liangkun 2020-11-26 14:39:52 +0800
  • f567a8cee 手机端工作日志问题处理 by liangkun 2020-11-26 14:39:39 +0800
  • 8dd276a92 Merge branch 'master' into 金隅分支 by zhichao lei 2020-11-25 16:10:46 +0800
  • 6f208cc2c 去掉isScrap 字段 by zhichao lei 2020-11-25 16:07:40 +0800
  • 88c82af2f Revert "出库回复老版本" by zhichao lei 2020-11-25 11:14:46 +0800
  • 4cac520d8 【修改】必修课选修课课表同步增加微信推送、飞星推送; by dyy 2020-11-24 18:09:01 +0800
  • fe8e443e4 出库回复老版本 by zhichao lei 2020-11-24 18:07:50 +0800
  • ee7ef8775 通知公告附件不显示 by zhichao lei 2020-11-24 16:42:55 +0800
  • 2e461dba6 学生评教功能报错处理 by liangkun 2020-11-24 16:26:01 +0800
  • 2f0be0823 资产修改 by zhichao lei 2020-11-24 10:03:07 +0800
  • b4ecb18df Merge branch 'master' of 123.57.209.16:bjquanjiang/DigitalScholl by liangkun 2020-11-23 18:03:17 +0800
  • d3a9e6473 去掉我的资产列表字段权限 by liangkun 2020-11-23 18:03:04 +0800
  • edc23865a Merge branch 'master' of http://123.57.209.16:3000/bjquanjiang/DigitalScholl by dyy 2020-11-23 17:53:43 +0800
  • 758d66624 【修改】教学工作安排增加微信推送、飞星推送; by dyy 2020-11-23 17:53:30 +0800
  • e6b646e39 资产报废修改报废字段 by zhichao lei 2020-11-23 16:02:14 +0800
  • 73359e4f2 【修改】微信推送、飞星推送代码处增加“信息推送管理”中信息推送项开启状态的判断; by dyy 2020-11-23 15:36:01 +0800
  • d40fd56ff 推送消息测试 去掉 by zhichao lei 2020-11-23 09:28:54 +0800
  • 7879faa95 Merge branch 'master' of http://123.57.209.16:3000/bjquanjiang/DigitalScholl by dyy 2020-11-20 17:46:35 +0800
  • bfc090c94 【新增】数据中心增加“信息推送管理”; by dyy 2020-11-20 17:46:18 +0800
  • 4e5cf3038 im服务制作 by liangkun 2020-11-20 16:46:42 +0800
  • 1b1738847 推送消息 by zhichao lei 2020-11-20 14:27:16 +0800
  • 6e48e976c 【新增】移动端-多账号绑定 by dyy 2020-11-20 11:22:50 +0800
  • 187750be7 Merge branch 'master' of 123.57.209.16:bjquanjiang/DigitalScholl by liangkun 2020-11-19 18:27:16 +0800
  • 7cc0f35b6 登录页微信地址修改 by liangkun 2020-11-19 18:27:04 +0800
  • 3984e50de Merge branch 'master' of http://123.57.209.16:3000/bjquanjiang/DigitalScholl by dyy 2020-11-19 18:19:57 +0800
  • 8bb49d02a 【新增】”个人办公“增加”多账号绑定“;首页右上角增加”切换账号“; by dyy 2020-11-19 18:19:43 +0800
  • 96b686bb5 adminTheme5 退出错误 by zhichao lei 2020-11-19 15:11:09 +0800
  • 1d9cf75a5 【新增】多账号绑定 by dyy 2020-11-19 14:59:44 +0800
  • 4cdfb36b0 Merge branch 'master' into 金隅分支 by zhichao lei 2020-11-18 16:04:56 +0800
  • 1c4307844 资产验收功能开发 by zhichao lei 2020-11-18 16:00:09 +0800
  • b153fb503 资产调拨明细查看 添加原单位, 新单位 by zhichao lei 2020-11-13 10:44:00 +0800
  • 1c8e2e114 流程监控 打印去除力软的标识 by zhichao lei 2020-11-13 09:18:08 +0800
  • 1727bb7aa Merge branch 'master' of 123.57.209.16:bjquanjiang/DigitalScholl by liangkun 2020-11-12 17:18:48 +0800
  • 423a3ccfe 招生信息查看导出报错处理 by liangkun 2020-11-12 17:18:36 +0800
  • 0b578887c 部门管理 分管校长id 绑定 by zhichao lei 2020-11-12 11:10:38 +0800
  • f1c5354c5 bug by zhichao lei 2020-11-11 17:57:23 +0800
  • 8606c87e2 金隅通知公告 by zhichao lei 2020-11-11 14:11:24 +0800
  • cdf6f8417 金隅通知公告 资产入库 类别同步 by zhichao lei 2020-11-11 13:10:51 +0800
  • 0246ea535 Merge branch '大厂分支' of 123.57.209.16:bjquanjiang/DigitalScholl into 大厂分支 by liangkun 2020-11-10 16:00:43 +0800
  • 333db3207 合并大厂分支 by liangkun 2020-11-10 16:00:38 +0800
  • e35d0fbdd 自定义表单增加当前角色 by liangkun 2020-11-09 16:11:27 +0800
  • 228f39264 oauth2.0文档更新 by liangkun 2020-11-03 18:32:37 +0800
  • afb463c71 Merge branch 'master' of 123.57.209.16:bjquanjiang/DigitalScholl by liangkun 2020-11-02 11:11:47 +0800
  • 11afc8caf oauth2.0文档 by liangkun 2020-11-02 11:11:36 +0800
  • 7f793f061 指定公文发布的种类和添加审核 by zhichao lei 2020-10-30 15:18:10 +0800
  • c989dbbc5 金隅教师信息导入修改 by zhichao lei 2020-10-30 09:56:35 +0800
  • 2b6d0c61f empinfo list 多条件查询增加条件 by zhichao lei 2020-10-29 10:21:51 +0800
  • dd7271f6b Merge branch 'master' of 123.57.209.16:bjquanjiang/DigitalScholl by liangkun 2020-10-28 18:25:18 +0800
  • a3d16717d auth20 by liangkun 2020-10-28 18:25:10 +0800
  • 9eb99dc1f 【修改】导入配置中可以设置字段唯一性、excel列名称; by dyy 2020-10-28 17:53:12 +0800
  • 73e189734 增加同步起始表位置 by zhichao lei 2020-10-28 14:56:30 +0800
  • a1d135876 Merge branch 'master' of 123.57.209.16:bjquanjiang/DigitalScholl by liangkun 2020-10-28 10:41:23 +0800
  • 8f3e464f3 connstring by liangkun 2020-10-28 10:41:08 +0800
  • 7ad7e9a1b 工资导入的时候增加录入发放时间 by zhichao lei 2020-10-28 09:28:56 +0800
  • c1b08e70b Merge branch 'master' of http://123.57.209.16:3000/bjquanjiang/DigitalScholl by dyy 2020-10-27 18:19:03 +0800
  • 14cc8d73d 【修改】教师职称变更管理、教职工退学管理、离职管理与教师信息管理进行同步;学籍、教师列表增加政治面貌; by dyy 2020-10-27 18:18:46 +0800
  • 162affd15 Merge branch 'master' of 123.57.209.16:bjquanjiang/DigitalScholl by liangkun 2020-10-27 18:15:19 +0800
  • b7e012ba6 auth2.0 by liangkun 2020-10-27 18:15:11 +0800
  • 1507946cd • 工资记录表加多条件查询 • 我的工资加导出 工资记录表开发导入功能 by zhichao lei 2020-10-27 14:04:49 +0800
  • 3d441ae9d Merge branch 'master' of 123.57.209.16:bjquanjiang/DigitalScholl by liangkun 2020-10-26 18:21:52 +0800
  • 52f35b658 新增统一应用2.0页面 by liangkun 2020-10-26 18:21:41 +0800
  • cfacb768c • 内控检查模块增加部门,和指定接收人 • 修改功能为只能一个人上传材料 增加查询条件部门 和指定接收人 by zhichao lei 2020-10-26 12:24:44 +0800
  • 328035130 【修改】教师信息管理:表单页面增加职称、职称岗位等级、职称获得时间;教师职称变更管理:与教师信息管理数据进行同步; by dyy 2020-10-23 18:02:32 +0800
  • 200ddd62b 金隅内控检查 添加指定接收人 by zhichao lei 2020-10-23 11:11:24 +0800
  • 4528be5aa 流程表单打印标题居中 by zhichao lei 2020-10-22 18:01:40 +0800
  • e6686e15d 小程序掌上评教列表页面 by zhichao lei 2020-10-22 11:55:43 +0800
  • 11d90d4a5 【增加】首页右上角增加解绑微信;统一认证-学生/教师用户管理:更多中增加解绑微信; by dyy 2020-10-21 17:30:17 +0800
  • f5efe198f 小程序听课记录 by zhichao lei 2020-10-21 12:01:53 +0800
  • 4db286821 【增加】增加快捷登录账号绑定页面;【修改】登录页增加使用微信登录按钮; by dyy 2020-10-20 17:00:50 +0800
  • c986eccc0 小程序增加功能 by zhichao lei 2020-10-20 15:49:06 +0800
  • 0f080fa05 催办审核推送修改 by liangkun 2020-10-20 11:08:18 +0800
  • bfcff1084 【修改】新生缴费管理:增加导出,删减列; by dyy 2020-10-19 18:01:21 +0800
  • d44d894a0 小程序登录提示 by zhichao lei 2020-10-19 17:07:05 +0800
  • 2752b0f22 • 表单设置中增加对当前信息: 1. 人员,部门 ,角色 等 条件的多条件查询设置 • 小程序增加功能: 公文查看 by zhichao lei 2020-10-19 16:39:45 +0800