FT/foton-slrs-system-rest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
416 Commits 1 Branch 0 Tags
ed4dd5ae232cb8a1680c00a83b4366c053f29ecb
Commit Graph
69 Commits
Author SHA1 Message Date
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
zxy-lbj 8e5b8bb239 Update application.properties 2021-07-02 03:29:41 +00:00
zxy-lbj 64e95dc4a6 Update application-dev.properties 2021-07-02 03:28:49 +00:00
zxy-lbj eb5f2a9e87 Update RestTemplateConfig.java 2021-07-02 03:14:22 +00:00
zxy-lbj 062d948719 Update RestTemplateConfig.java 2021-07-02 03:06:30 +00:00
zxy-lbj 6c56c8ba29 Update RestTemplateConfig.java 2021-07-02 03:04:04 +00:00
root 4a8b94408d fetch:加入负载均衡 2021-07-02 11:02:29 +08:00
zxy-lbj e487fc3a79 Update application-dev.properties 2021-07-02 02:38:07 +00:00
root 086c387165 查询机构人员 2021-07-01 18:17:04 +08:00
zxy-lbj 03162b8e85 Update application-dev.properties 2021-07-01 03:31:06 +00:00
root b543a9502d 资源管理 2021-06-30 17:28:39 +08:00
root 52015144b5 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-06-30 13:37:56 +08:00
王夏晖 b69bc81066 Update application-dev.properties 2021-06-30 05:02:07 +00:00
root 39e5e4c4c5 人员配置机构 2021-06-29 16:34:02 +08:00
yinglong zhang 4533960ef9 feat 修改了一些搜索模块 2021-06-29 09:07:06 +08:00
赵肖云 209f43fe1a fetch:人员添加字段 2021-06-25 15:49:30 +08:00
yinglong zhang a069424edf feat 重写了一些诡异的代码 2021-06-24 11:05:25 +08:00
赵肖云 b0751be63a 岗位管理 2021-06-24 10:43:53 +08:00
yinglong zhang 7aeb6b099a feat 重写了一些诡异的代码 2021-06-24 10:23:52 +08:00
yinglong zhang f284c60088 feat 重写了一些诡异的代码 2021-06-24 09:58:06 +08:00
yinglong zhang 907a54c3a9 fetch:添加个人 2021-06-22 17:15:06 +08:00
赵肖云 322e057cd4 fetch:新增机构/人员 2021-06-22 14:06:01 +08:00
yinglong zhang 07c2fae280 add 添加个人模块 2021-06-22 09:54:31 +08:00
赵肖云 8a2790d705 fetch:未符合项查询bug 2021-06-21 09:13:43 +08:00
赵肖云 b85c133749 fetch: 修改关闭未符合项接口数据格式 2021-06-18 15:46:31 +08:00