FT/foton-slrs-system-rest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
612 Commits 1 Branch 0 Tags
cdb3a9ccd405d876451463e2e00a6013be4937f3
Commit Graph
93 Commits
Author SHA1 Message Date
yuezhihang 508c292200 配置文件 2021-08-18 15:15:06 +08:00
yuezhihang 39561c91d2 代码部分恢复 2021-08-18 14:38:00 +08:00
2510220824 a45045f61c add:重置mq配置 2021-08-18 09:35:41 +08:00
2510220824 67adf4145a Merge remote-tracking branch 'origin/develop_master' into develop_master 2021-08-17 16:16:33 +08:00
2510220824 7b28ebb23c add:ocr配置 2021-08-17 16:15:51 +08:00
super_liu 1791877be5 feat: There is no way the 2021-08-17 15:04:17 +08:00
super_liu dbb69c8676 feat: There is no way the 2021-08-17 10:47:27 +08:00
2510220824 17a82cf235 add:恢复es配置 2021-08-16 10:18:15 +08:00
yuezhihang 39c08ecb81 发版配置 2021-08-13 09:15:01 +08:00
yuezhihang 3327223c25 Merge remote-tracking branch 'origin/develop_1' into develop_master 2021-08-13 09:06:16 +08:00
super_liu bf800309c4 feat: 新增 convert 转换pdf子项目 MQ 2021-08-12 11:06:42 +08:00
Mr.Z db5ea125fb Merge remote-tracking branch 'origin/develop_master' into develop_1 2021-08-11 23:06:47 +08:00
Mr.Z 1374bc5807 zyh自用 2021-08-11 23:03:40 +08:00
super_liu b7e9cc3061 feat: 新增 convert 转换pdf子项目 2021-08-11 17:40:26 +08:00
yuezhihang 32f7678427 ky 上传文件类型限制！！！ 2021-08-08 10:41:26 +08:00
super_liu 4f6b95a5f2 feat: 发版配置文件 不用替换 2021-08-07 11:48:08 +08:00
super_liu 77bc46b1ba feat:eee 2021-08-06 16:24:42 +08:00
super_liu 0649d3850a feat: 2021-08-06 16:20:31 +08:00
王夏晖 db69ac1f13 Update application.properties 2021-08-05 09:46:55 +00:00
super_liu b3a46bbabc feat: es 2021-08-05 17:18:44 +08:00
yuezhihang 78ec0a08c7 发版配置更新 2021-08-05 09:24:51 +08:00
王夏晖 2344ccfda2 Update application-dev.properties 2021-08-02 05:40:33 +00:00
王夏晖 4148f1bf6b Update application.properties 2021-08-02 05:38:46 +00:00
zhaokaiyao@91isoft.com bda7690807 最新 2021-07-31 22:29:40 +08:00
yuezhihang 343913c799 标准清单入库 bug修复 2021-07-30 15:20:56 +08:00
super_liu 8fd8a7541b Merge branch 'develop_master' into develop_3 2021-07-27 10:41:10 +08:00
super_liu b5a53bf905 feat: es MQ 全局判断 2021-07-27 10:40:43 +08:00
super_liu ebedd9ee4c feat: 200 2021-07-27 09:31:45 +08:00
super_liu b3cc1704b2 feat: 200M 文件限制 2021-07-27 09:26:09 +08:00
zzy c4e563081a update：回复配置文件 2021-07-22 17:04:55 +08:00
Wanghong 1ad63eff70 默认变更列表 2021-07-21 16:02:50 +08:00
王夏晖 eca5c9ae33 Update application-dev.properties 2021-07-16 08:50:12 +00:00
王夏晖 ee73581912 Update application.properties 2021-07-16 08:27:45 +00:00
zxy-lbj 59b8ee7e19 Update application-dev.properties 2021-07-16 03:10:09 +00:00
王夏晖 952c3ab02a Update application-dev.properties 2021-07-09 03:42:02 +00:00
super_liu 78d87640eb Merge branch 'develop_3' into 'develop_master' 
Develop 3  feat: 标准库 左侧树 相关 配置标准 更新记录相关等

See merge request !18
 2021-07-08 14:59:10 +00:00
super_liu e067c8ae61 feat: 标准库 左侧树 相关 配置标准 相关等 2021-07-08 22:34:07 +08:00
root 9020a2782f Merge branch 'develop_master' of http://101.36.229.190:90/LiuChao/foton-slrs-system-rest into develop_2 2021-07-08 15:46:53 +08:00
root 9432d1a2f4 fetch:我的模块数据 2021-07-08 15:46:19 +08:00
duanwenbin 1ed0888256 提交ocr模块配置 2021-07-08 09:22:56 +08:00
duanwenbin c1a0b31372 Merge remote-tracking branch 'origin/develop_master' into develop_master 
# Conflicts:
#	adc-da-sys/src/main/resources/mybatis/mapper/att/AttFileEOMapper.xml
 2021-07-07 11:23:08 +08:00
duanwenbin 9709acf0a9 提交本地工具模块相关代码 2021-07-07 11:21:42 +08:00
root fb05c70666 test 2021-07-07 10:52:45 +08:00
王夏晖 3c7acb2705 Update application-dev.properties 2021-07-07 02:21:45 +00:00
yinglong zhang 9a00280ba0 feat 改回注册中心配置 2021-07-07 09:53:29 +08:00
root 1ea0d09cb0 fetch:机构人员bug 2021-07-06 17:30:30 +08:00
王夏晖 7bb46ef07f Update application-dev.properties 2021-07-05 02:34:45 +00:00
root 9e97c80c5e Merge branch 'develop_master' of http://101.36.229.190:90/LiuChao/foton-slrs-system-rest into develop_2 
 Conflicts:
	adc-da-main/src/main/resources/application-dev.properties
 2021-07-04 16:48:26 +08:00
yinglong zhang 531bb9e7ce feat 合并分支 2021-07-04 16:41:37 +08:00
root afee88a408 fetch:资源修改 2021-07-02 17:32:26 +08:00