DZ/faw-report-library-boot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
322 Commits 1 Branch 0 Tags
09bafc78dc4a26eab554c0c14e910657a51c0477
Commit Graph
322 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
bupengxiang 09bafc78dc [修改] 并发 流程编号重复问题 2023-05-18 17:59:21 +08:00
bupengxiang 0dd034e730 Merge branch 'lixuetao' 2023-05-18 17:19:27 +08:00
bupengxiang 73c88ffe82 Merge remote-tracking branch 'origin/lixuetao' into lixuetao 2023-05-18 17:15:18 +08:00
bupengxiang d1ae4c37e7 [修改] 重名命题 2023-05-18 17:15:10 +08:00
mzaxd a297980511 feat:重新打开浏览器后不丢失登陆状态 
将新的sessionId返回给前端
 2023-05-18 16:59:05 +08:00
zer0Black 4f9214a48c 【review】评审 2023-05-18 16:31:15 +08:00
bupengxiang 8da539164e Merge branch 'lixuetao' 2023-05-18 15:06:53 +08:00
bupengxiang f68b6756c1 [修改] 添加用户的手机号验证规则 2023-05-18 14:36:36 +08:00
bupengxiang c02c1adec9 Merge branch 'lixuetao' 2023-05-18 11:54:55 +08:00
bupengxiang b10bf0898f [修改] 监控流程 2023-05-18 11:50:34 +08:00
bupengxiang d9ca17ce3f [修改] 流程中心 2023-05-18 11:25:06 +08:00
bupengxiang 34790e5778 Merge remote-tracking branch 'origin/lixuetao' into lixuetao 2023-05-18 10:27:14 +08:00
bupengxiang e4ee26b176 [修改] 报告流程权限私有化 2023-05-18 10:27:01 +08:00
mzaxd 1d2f29477b fix:修复Bug【69372】 
报告管理--编辑时，第一次保存到了草稿，第二次发起编辑后，报告管理中多了一条数据
 2023-05-18 10:04:27 +08:00
bupengxiang 55cfac6509 [修改] 修改用户 ，手机号验证正则 2023-05-18 09:50:32 +08:00
bupengxiang 5ef5a5ff03 Merge branch 'lixuetao' 2023-05-18 09:09:23 +08:00
bupengxiang abad378fae Merge remote-tracking branch 'origin/lixuetao' into lixuetao 2023-05-18 09:08:02 +08:00
bupengxiang 9b4a5d12f9 [修改] 流程中心 效率优化 2023-05-18 09:07:53 +08:00
xuetao.li ad0b67f76d Merge remote-tracking branch 'origin/lixuetao' into lixuetao 
# Conflicts:
#	adc-da-sys/src/main/java/com/adc/da/sys/service/UserEOServiceImpl.java
 2023-05-17 17:14:05 +08:00
xuetao.li 405d2d0828 同步功能编写完毕 2023-05-17 17:12:37 +08:00
mzaxd 62c6cf3ef5 ci:调整地址，增加日志打印，放开登录接口拦截 2023-05-17 16:39:00 +08:00
mzaxd 71c23c2e1e ci:将sso获取token和sso获取userInfo的链接调整为新版测试地址 2023-05-17 16:39:00 +08:00
mzaxd b1ccfb1b66 feat:单点登录 2023-05-17 16:38:33 +08:00
bupengxiang 0c0567095a [修改] 从草稿编辑已删除得报告，加校验 2023-05-17 16:17:10 +08:00
bupengxiang ceb28723f1 Merge branch 'lixuetao' 2023-05-17 15:38:24 +08:00
bupengxiang be5c2ff02c [修改] 查询全部用户 2023-05-17 15:37:35 +08:00
mzaxd e6379e6ae7 fix:修复预览下载权限显示不正确问题 2023-05-17 11:37:36 +08:00
bupengxiang b5b48c16c2 [修改] 用户模板导入 2023-05-17 11:24:12 +08:00
bupengxiang 41f3aec37e [修改] 保存到草稿 因dataId引起的偶现问题 2023-05-17 10:57:38 +08:00
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