Commit Graph
39 Commits
Author SHA1 Message Date
xuetao.li 5219263cae 移除误提交的target 2023-05-16 18:00:07 +08:00
xuetao.li 8b9ad09c48 同步测试,修改org表 2023-05-16 17:29:40 +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 78b5c3ba19 [修改] 流程中心变更 2023-05-10 10:48:36 +08:00
bupengxiang 7c793af87c [新增] 权限申请流程 2023-05-09 16:35:16 +08:00
zer0Black 960ea0603e 同步代码编写完毕 2023-05-09 14:29:21 +08:00
bupengxiang 3542bd6899 [修改] target 2023-05-08 10:34:12 +08:00
mzaxd 10293badd6 ci: 修改配置文件 2023-04-28 15:59:37 +08:00
mzaxd 63c173e21b ci: 更改Redis连接地址 2023-04-28 10:10:34 +08:00
mzaxd cc7fd6d6ce 删除所有ES相关代码 2023-04-28 09:38:50 +08:00
mzaxd 8fbe459c31 fix: 修复预览功能
报表上传以后目前可以正常预览
2023-04-28 09:14:46 +08:00
mzaxd 2b50369f0a feat: 本地上传功能
增加本地上传功能,需在配置文件中配置
2023-04-28 09:14:45 +08:00
mzaxd 44971c6e60 ci: 简化本地上传配置 2023-04-28 09:14:45 +08:00
mzaxd 01f967360c ci: 增加ES配置 2023-04-28 09:14:45 +08:00
mzaxd 746a23ef94 ci: 更改配置文件默认上传为本地 2023-04-28 09:14:45 +08:00
mzaxd aed4b71395 feat: 本地上传
新增本地上传功能,上传路径可配置
2023-04-28 09:10:23 +08:00
mzaxd ebd2750533 增加路径测试接口 2023-04-28 09:10:23 +08:00
bupengxiang 2d1b1d2066 [合并] ‘caihaohan’合并到 ‘lixuetao’ 解决冲突 2023-04-24 11:18:57 +08:00
bupengxiang 6d3e7fe66e Merge branch 'caihaohan' into lixuetao
# Conflicts:
#	adc-da-main/target/classes/application-dev.properties
#	adc-da-report/src/main/java/com/adc/da/report/service/impl/IReportServiceImpl.java
#	adc-da-report/target/classes/com/adc/da/report/controller/ReportManageConroller.class
#	adc-da-report/target/classes/com/adc/da/report/service/impl/IReportServiceImpl.class
#	adc-da-report/target/classes/com/adc/da/report/util/PdfUtil.class
#	adc-da-report/target/classes/com/adc/da/report/util/PptUtil.class
#	adc-da-report/target/classes/mybatis/mapper/mysql/ReportManageMapper.xml
#	adc-da-sys/src/main/java/com/adc/da/sys/dao/mysql/UserEODao.java
#	adc-da-sys/src/main/java/com/adc/da/sys/service/UserEOServiceImpl.java
#	adc-da-sys/src/main/java/com/adc/da/sys/service/iservice/IUserEoService.java
#	adc-da-sys/src/main/resources/mybatis/mapper/sys/mysql/UserEOMapper.xml
#	adc-da-sys/target/classes/com/adc/da/sys/controller/UserEOController.class
#	adc-da-sys/target/classes/com/adc/da/sys/service/RoleEOService.class
#	adc-da-sys/target/classes/dozer/dozer-mappings-ddm.xml
#	pom.xml
2023-04-24 11:15:18 +08:00
bupengxiang 2fe1a1ab52 [新增] 权限申请流程 2023-04-23 17:49:21 +08:00
bupengxiang 4280f39aeb 修改 流程图保存后的回调端口 2023-04-21 17:45:45 +08:00
bupengxiang 560fcdd75a 修改工作流页面的前端代码 2023-04-21 16:38:25 +08:00
bupengxiang 9092f1a38f 工作流 启动 2023-04-19 17:37:47 +08:00
xuetao.li 48af797f96 处理mapper位置问题 2023-04-19 17:32:11 +08:00
xuetao.li 94ecb32608 处理activity启动 2023-04-19 16:30:07 +08:00
xuetao.li dbe999143a 去掉额外的fk包 2023-04-19 16:19:18 +08:00
zer0Black b51b43b449 去掉错误的提交 2023-04-19 15:15:03 +08:00
zer0Black 3ae4481ee8 工作流引入【未完全修复完毕】 2023-04-19 15:15:02 +08:00
xuetao.li 2767e7e737 去掉不需要的TODO 2023-04-19 09:36:38 +08:00
xuetao.li 4ce40d9553 修改以前的垃圾代码 2023-04-18 15:46:20 +08:00
xuetao.li e796a0000e 同步基本框架处理完毕 2023-04-18 11:53:45 +08:00
xuetao.li 3557015f15 去掉配置文件里没用的东西 2023-04-17 18:19:50 +08:00
zer0Black 0d878d45cb 工作流相关提交 2023-04-17 15:16:53 +08:00
zer0Black 8350f9688a 去掉错误的提交 2023-04-17 15:06:23 +08:00
zer0Black b40519a302 工作流引入【未完全修复完毕】 2023-04-17 13:49:01 +08:00
yangjianze f04bcab92b feature(华为云集成): 2022-11-14 10:28:03 +08:00
zer0Black cb1312ac79 注释掉不要的代码 2022-09-05 15:13:57 +08:00
zer0Black 77ca26d6c7 初始化 2022-08-31 14:06:07 +08:00