k18-ntcs-web-ntc

Archived

This repository has been archived on 2025-09-14. You can view files and clone it, but cannot push or open issues or pull requests.

Go to file

duandongmei fe516d44a8 Merge branch 'develop' of http://192.168.10.125/k18_web/NFS.git into

develop

Conflicts:
	src/main/resources/messages/message_en.properties
	src/main/resources/messages/message_ru.properties
	src/main/resources/messages/message_zh_CN.properties
	拦截域名增加拦截强度

2018-10-15 19:22:17 +08:00

.externalToolBuilders

界面框架初步提交

2018-02-02 17:58:32 +08:00

.settings

融合代码提交本地

2018-03-28 13:05:56 +08:00

lib

1.新 httpclient版本到4.5.6，解决凯歌提出的4.4.1版本存在的连接可能出现失败问题

2018-09-10 11:39:04 +08:00

sqlupdate

1、修改登录界面图标；2、修改国际化英文文件中的视频的英文单词拼写错误(包括代码与数据中）

2018-07-27 11:20:42 +08:00

src

Merge branch 'develop' of http://192.168.10.125/k18_web/NFS.git into

2018-10-15 19:22:17 +08:00

.classpath

添加ipv6转换类库，处理ipv6格式的转换

2018-05-30 15:12:11 +08:00

.gitignore

解决冲突

2018-02-23 12:36:16 +08:00

.project

添加业务配置控制层、事务层、数据层类

2018-01-09 16:50:39 +08:00

.tern-project

业务辅助表-业务字典管理平台分页展示条件搜索，（新增修改部分功能未完善）

2018-03-01 19:13:57 +08:00

pom.xml

修改jersey的依赖排除

2018-09-28 16:17:43 +08:00

README.md

Update README.md

2017-12-29 16:33:20 -05:00

README.md

gk for web