Commit Graph

252 Commits (ff583ae1399099cb46e5b3ff1b2aa78ea6aa9ffd)

Author SHA1 Message Date
wangziyangyang ad93cdf614 更新前端封装控件名称、、新增弹框模糊搜索 2020-03-12 16:21:45 +08:00
wangziyangyang b704b4a727 Merge branch 'songpengmaster' 2020-03-12 15:36:03 +08:00
wangziyangyang 9e8a1c7258 Merge remote-tracking branch 'origin/master' into songpengmaster 2020-03-12 15:35:25 +08:00
wangziyangyang 7c13304a7f 开发动态插入单行数据 2020-03-12 15:34:16 +08:00
wangziyangyang a44198057d 开发动态插入单行数据 2020-03-12 15:32:57 +08:00
iamsongpeng f391d962ac 更新基础框架 2020-03-12 14:25:37 +08:00
wangziyangyang e1e9940430 开发主数据动态编辑,动态添加功能
删除不需要的文件
2020-03-12 12:36:00 +08:00
wangziyangyang 2d58dddf9c 开发主数据,动态编辑功能。
增加通用DTO对象
2020-03-11 17:24:01 +08:00
wangziyangyang 010db50779 新增主数据功能说明 2020-03-11 15:35:02 +08:00
wangziyangyang 3afe3b4b9d 开发基础主数据查询根据配置动态分页查询功能 2020-03-11 15:28:32 +08:00
wangziyangyang 513c0eac2e 调整基础数据UI界面 2020-03-11 09:42:42 +08:00
wangziyangyang ae414db7f7 新增基础数据维护界面 2020-03-11 08:16:42 +08:00
wangziyangyang 39919fc6bd 完善注释,增加删除功能 2020-03-10 15:50:45 +08:00
wangziyangyang 1ef4975539 完善主数据添加,数据回显功能 2020-03-10 14:41:07 +08:00
wangziyangyang 041698b659 删除 2020-03-10 10:26:11 +08:00
wangziyangyang b50a784518 增加SQL 文件 2020-03-10 10:25:45 +08:00
wangziyangyang 0af9093446 开发表字段添加保存功能 2020-03-10 10:20:59 +08:00
wangziyangyang 7de4237448 去掉验证码示例图。更改首页图片 2020-03-10 09:16:55 +08:00
wangziyangyang 9869ff490c 过滤重复字段 2020-03-09 17:35:49 +08:00
wangziyangyang c974867211 根据表名称自动获取字段。。动态添加 2020-03-09 15:26:49 +08:00
wangziyangyang 804a746524 开发主数据配置平台界面 2020-03-06 17:46:04 +08:00
wangziyangyang cc297f7295 开发主数据配置平台界面 2020-03-06 17:34:15 +08:00
wangziyangyang e8113721e6 开发主数据配置平台 2020-03-06 17:32:30 +08:00
MES-智能制造 d03c13518c 修改 2020-03-06 13:29:20 +08:00
wangziyangyang b1e0cfd26e 增加swagger说明 2020-03-06 13:26:53 +08:00
wangziyangyang 2838fde405 增加swagger接口说明 2020-03-06 13:12:58 +08:00
wangziyangyang 6ec8e95f56 删除不用目录结构 2020-03-06 13:11:14 +08:00
wangziyangyang f4b6136268 1.增加主模块,开发数据结构
2.修改实体类模板
3.更新sql文件
2020-03-06 13:10:07 +08:00
wangziyangyang 340e6ad05d Merge branch 'songpengmaster'
# Conflicts:
#	README.md
2020-03-06 12:57:45 +08:00
wangziyangyang 6b355f0854 Merge remote-tracking branch 'origin/master' into songpengmaster 2020-03-06 12:56:53 +08:00
iamsongpeng 37bc8c7973 Ajax 请求302问题,session失效页面跳转 2020-03-06 12:53:46 +08:00
wangziyangyang 244bc6e0c6 Merge remote-tracking branch 'gitee/master' 2020-03-06 09:47:17 +08:00
wangziyangyang aff59fb389 新增验证码功能,取消默认账号密码 2020-03-06 09:47:02 +08:00
wangziyangyang 46c37a66fb Merge branch 'songpengmaster'
# Conflicts:
#	README.md
2020-03-06 09:41:56 +08:00
wangziyangyang c5e4274455 Merge remote-tracking branch 'origin/master' into songpengmaster
# Conflicts:
#	sparchetype/src/main/java/com/songpeng/sparchetype/system/controller/client/SysLoginController.java
#	sparchetype/src/main/java/com/songpeng/sparchetype/system/service/impl/SysMenuServiceImpl.java
#	sparchetype/src/main/resources/templates/login.ftl
2020-03-06 09:31:22 +08:00
MES-智能制造 2d08dfe718 add LICENSE. 2020-03-06 09:27:27 +08:00
MES-智能制造 012f33b470 更新 2020-03-06 09:23:10 +08:00
wangziyangyang e1d8061788 增加界面演示 2020-03-06 09:17:31 +08:00
iamsongpeng e747135d1f 图形验证码功能 2020-03-06 09:09:50 +08:00
wangziyangyang 09bde71a13 增加功能描述 2020-03-06 09:08:47 +08:00
wangziyangyang 95b2201021 Merge branch 'master' into songpengmaster
# Conflicts:
#	sparchetype/src/main/java/com/songpeng/sparchetype/system/controller/client/SysLoginController.java
2020-03-05 15:58:27 +08:00
wangziyangyang 0ae52b9e39 Merge remote-tracking branch 'origin/master' into songpengmaster 2020-03-05 15:57:43 +08:00
iamsongpeng 1aaa148cab 更新代码结构 2020-03-05 15:31:25 +08:00
wangziyangyang 427dfdb35c 优化登录界面 2020-03-05 15:24:57 +08:00
wangziyangyang 93fca63cd8 新增新版粒子特效插件 2020-03-05 14:50:52 +08:00
wangziyangyang 7d0095fd32 登录名称改变 2020-03-05 14:29:46 +08:00
wangziyangyang f5ffbdaf98 优化UI界面,新增异常处理页面 2020-03-05 13:41:54 +08:00
wangziyangyang 628c627ef3 优化权限验证 2020-03-04 17:09:21 +08:00
wangziyangyang 50f5cb0390 Merge branch 'master' into songpengmaster 2020-03-04 14:53:11 +08:00
iamsongpeng 4005cdf480 前端框架缩放bug修复 2020-03-04 14:45:13 +08:00