DZ/faw-report-library-boot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
293 Commits 1 Branch 0 Tags
2915442675b6b2e3826fff7cd24a4149458ed08b
Commit Graph
293 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
bupengxiang 2915442675 Merge branch 'lixuetao' 2023-05-17 09:22:53 +08:00
bupengxiang 39e8848eb7 [修改] 修改用户时 修改密码问题 2023-05-17 09:20:56 +08:00
bupengxiang 70f1e89629 [修改] userEomapper 2023-05-16 20:10:21 +08:00
bupengxiang 5e5ecd9583 Merge remote-tracking branch 'origin/lixuetao' into lixuetao 
# Conflicts:
#	adc-da-sys/src/main/java/com/adc/da/sys/page/OrgEOPage.java
 2023-05-16 19:03:09 +08:00
bupengxiang e56bdf3d32 [修改] 组织管理模块 2023-05-16 19:01:36 +08:00
mzaxd aa80c5da1f fix:修复组织机构管理不显示数据BUG 2023-05-16 18:45:37 +08:00
xuetao.li d75607102a 修复秘钥生产的url传递错误问题 2023-05-16 18:37:24 +08:00
xuetao.li af48dbe48a 移除误提交的target 2023-05-16 18:36:37 +08:00
bupengxiang a45b96b820 [修改] orgEopage 2023-05-16 18:30:54 +08:00
mzaxd a9bc15b5eb ci:修改UserEOMapper中的数据库字段 2023-05-16 18:28:25 +08:00
mzaxd d7ab68933a ci:修改ORG实体类 2023-05-16 18:22:24 +08:00
bupengxiang 90a4d20c3c [修改] TtReportManageActMapper.xml 2023-05-16 18:15:27 +08:00
bupengxiang 28fb15382e [修改] UserEOMapper.xml 2023-05-16 18:12:23 +08:00
mzaxd c00e431bed ci:将部分orgCode改为DepartmentCode 2023-05-16 18:08:10 +08:00
mzaxd d454c7e3a6 ci:将部分orgName改为longName 2023-05-16 18:01:02 +08:00
xuetao.li 5219263cae 移除误提交的target 2023-05-16 18:00:07 +08:00
bupengxiang ac6129e9c3 Merge remote-tracking branch 'origin/lixuetao' into lixuetao 2023-05-16 17:55:30 +08:00
bupengxiang 479cf83506 [修改] orgEomapper 2023-05-16 17:55:23 +08:00
xuetao.li 71fdf48fe0 转换org问题完毕 2023-05-16 17:51:55 +08:00
xuetao.li 40e7e67760 Merge remote-tracking branch 'origin/lixuetao' into lixuetao 2023-05-16 17:41:48 +08:00
xuetao.li 8b9ad09c48 同步测试，修改org表 2023-05-16 17:29:40 +08:00
mzaxd 1de7549f25 fix:修复[评论接口缺少账号字段]Bug 2023-05-16 17:27:03 +08:00
bupengxiang d5a8df76a1 [修改] 监控流程审核历史 2023-05-16 17:13:54 +08:00
mzaxd 0106517804 fix:修复[角色管理-保存的权限显示不正确]Bug 2023-05-16 16:35:22 +08:00
bupengxiang 7843a9e00d Merge branch 'lixuetao' 2023-05-16 16:20:23 +08:00
bupengxiang 46c3f98a5f [修改] 切分支 提targer 2023-05-16 16:17:54 +08:00
bupengxiang 89e829781e [修改] isAct 2023-05-16 16:17:24 +08:00
mzaxd f59b25a85c fix:修复[编辑按钮报错]Bug 
编辑报告-部门为空的时候，编辑按钮报错
 2023-05-16 16:05:37 +08:00
mzaxd 4063bb9fda feat:预览下载权限增加判断EmployeeTypeID 2023-05-16 15:51:16 +08:00
bupengxiang 6e6ce8f49a Merge remote-tracking branch 'origin/lixuetao' into lixuetao 2023-05-16 15:34:34 +08:00
bupengxiang ba11a47341 [修改] 部门修改 修改编码 2023-05-16 15:34:19 +08:00
mzaxd a5e11115d3 ci:menu新增字段及相应逻辑 2023-05-16 15:10:37 +08:00
bupengxiang 103ff19650 [修改] 添加编辑用户 部门回显 2023-05-16 15:07:52 +08:00
bupengxiang 770bbdfff4 [修改] 删除草稿时，删除业务数据 2023-05-16 14:58:47 +08:00
bupengxiang 2b22e95e3b [修改] 草稿删除，删除业务数据 2023-05-16 14:52:20 +08:00
bupengxiang d151af2234 [修改] 监控流程审批步骤 2023-05-16 13:53:41 +08:00
bupengxiang 882053a6df Merge branch 'lixuetao' 2023-05-16 11:48:07 +08:00
bupengxiang 7e02e430d9 Merge remote-tracking branch 'origin/lixuetao' into lixuetao 2023-05-16 11:46:31 +08:00
bupengxiang fcdcea3afc [修改] 修改 转办 与审批历史 2023-05-16 11:46:20 +08:00
mzaxd c3453a34d8 fix:修复Bug【69319】 
报告管理--编辑页面没有回显保密日期
 2023-05-16 10:49:24 +08:00
bupengxiang 24da664d0a [修改] 获取当前人领导 2023-05-16 10:45:05 +08:00
bupengxiang be297b9c31 Merge branch 'lixuetao' 2023-05-16 10:15:47 +08:00
bupengxiang 0b39a1454d [修改] 流程中心搜索 2023-05-16 10:15:16 +08:00
bupengxiang dc22b3ba70 Merge branch 'lixuetao' 2023-05-16 10:03:32 +08:00
bupengxiang c94ac509e9 [修改] 切分支 提targer 2023-05-16 10:02:23 +08:00
bupengxiang aa1cbe54aa [修改] 切分支 提一下target 2023-05-16 10:00:30 +08:00
bupengxiang b860961095 [修改] 保密到期定时任务 2023-05-16 09:44:26 +08:00
李雪涛 ed99b87dc0 合并分支 'lixuetao' 到 'master' 
Lixuetao

查看合并请求 faw-report-library/faw-report-library-boot!6
 2023-05-15 18:15:13 +08:00
bupengxiang c1958b2c4e [修改] 流程页面权限 2023-05-15 18:01:44 +08:00
bupengxiang 664efab332 [修改] 报告编辑流程 2023-05-15 17:51:40 +08:00