Commit Graph
92 Commits
Author SHA1 Message Date
xuetao.li aae929f6ba 修复文件任意上传windows的$$DATA文件流问题 2023-06-06 14:15:18 +08:00
zer0Black 85836680c7 Merge remote-tracking branch 'origin/master' 2022-08-16 11:06:21 +08:00
zer0Black 3d645755ec 参数收集 多选拉下框回显问题 2022-08-16 11:00:39 +08:00
zer0Black 2dec17b06a Merge branch 'fix_bug_first_stage'
# Conflicts:
#	jero-web/src/common/lang/en-us.js
#	jero-web/src/common/lang/zh-cn.js
2022-08-15 21:02:40 +08:00
xuetao.li b857322700 去掉项目查询的权限 2022-08-11 15:42:33 +08:00
zer0Black a4e4ef4928 sql文件同步提交 2022-08-04 22:59:05 +08:00
zer0Black 08f5e57fe9 Merge remote-tracking branch 'origin/master' 2022-08-04 22:34:59 +08:00
zer0Black a4b6ddeefe 回滚错误的改动 2022-08-04 22:33:16 +08:00
zer0Black 4928510032 sql文件同步提交 2022-08-04 10:48:33 +08:00
zer0Black a21d139770 去除NumberInfo组件 2022-08-01 09:53:28 +08:00
zer0Black a71c033e78 space同步的打印日志改为info 2022-07-31 10:56:06 +08:00
zer0Black 4d523eddd8 修改翻译错误 2022-07-26 15:18:34 +08:00
zer0Black 6f9ad0cd93 去除填写人的强制撤回 2022-07-26 12:37:39 +08:00
zer0Black 47eb23796c Merge remote-tracking branch 'origin/dev_third_stage' into dev_third_stage 2022-07-25 19:41:23 +08:00
zer0Black 47fdd9db13 修复由于sdt离职导致的下发失败的bug 2022-07-25 19:41:12 +08:00
zer0Black 8674a7d52f 左上角名称的横线缩短 2022-07-24 17:31:06 +08:00
zer0Black 2715dd2b68 认证收集的参数导出 工程接口人角色只看到自己的数据 2022-07-24 17:22:01 +08:00
zer0Black fa0a81eadf 更改默认用户角色为 “一般用户” 2022-07-22 15:34:53 +08:00
zer0Black a4970c83d7 Merge remote-tracking branch 'origin/fix_bug_first_stage' into fix_bug_first_stage 2022-07-22 15:21:00 +08:00
zer0Black 4628439169 调整相关人员名单导入账号大小写错误的问题 2022-07-22 15:15:51 +08:00
zer0Black 71600c2931 Merge branch 'dev_third_stage'
# Conflicts:
#	jero-boot/db/蔚来标准sql/dev_third_record.sql
2022-07-21 21:04:17 +08:00
zer0Black 079c7ffb98 Merge remote-tracking branch 'origin/fix_bug_first_stage' into fix_bug_first_stage 2022-07-05 15:10:41 +08:00
zer0Black 6e89cf7dac reply的英文改为replied 2022-07-05 15:10:31 +08:00
zer0Black 8886d83ba4 Merge remote-tracking branch 'origin/fix_bug_first_stage' into fix_bug_first_stage 2022-07-04 10:11:31 +08:00
zer0Black e4e3508b54 数据库记录 2022-07-04 10:09:54 +08:00
zer0Black 19cef7e0ac 用户名补充上 2022-07-02 14:41:03 +08:00
zer0Black 0242707040 Merge remote-tracking branch 'origin/fix_bug_first_stage' into fix_bug_first_stage 2022-07-02 12:10:04 +08:00
zer0Black fcbd926115 我的消息类型缺少中文翻译的bug 2022-07-02 12:09:57 +08:00
zer0Black 1cae6e9239 标签提交的问题 2022-07-01 17:50:18 +08:00
zer0Black e3c2475947 处理代码合并漏了的问题 2022-07-01 15:21:19 +08:00
zer0Black 3f43ede228 [fix]导出的文件名切换为中英文可切换的模式 2022-07-01 15:19:51 +08:00
zer0Black a696406651 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/impl/ParamsInfoEOServiceImpl.java
#	jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/InventoryAffirmJob.java
#	jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java
#	jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskInventoryEOServiceImpl.java
#	jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java
#	jero-web/src/common/lang/en-us.js
#	jero-web/src/common/lang/zh-cn.js
#	jero-web/src/components/uploadFileChangeDown/file.vue
2022-07-01 15:12:31 +08:00
zer0Black 419aeafdba Merge remote-tracking branch 'origin/dev_third_stage' 2022-07-01 15:01:16 +08:00
zer0Black 03031f6563 Merge branch 'dev_third_stage' 2022-07-01 15:00:48 +08:00
zer0Black 1e5eb47d97 Merge remote-tracking branch 'origin/fix_bug_first_stage' into fix_bug_first_stage 2022-07-01 14:51:15 +08:00
zer0Black b3be2ec395 转发加上地址 2022-07-01 14:51:05 +08:00
zer0Black 50342fcbe4 飞书发送卡片消息对接完成 2022-07-01 13:38:20 +08:00
zer0Black 73d3fdba36 所有消息,接入飞书 2022-07-01 12:05:46 +08:00
zer0Black c32ebf0818 消息类型添加 2022-07-01 10:43:57 +08:00
zer0Black 93033faac8 Merge remote-tracking branch 'origin/fix_bug_first_stage' into fix_bug_first_stage 2022-06-30 14:58:49 +08:00
zer0Black e679550a6f 按照责任领域的名称进行了正向排序 2022-06-30 14:58:40 +08:00
zer0Black 8d0368e73b 强制认证参数列表的标题可以换行 2022-06-29 13:03:53 +08:00
zer0Black 60a25bf28a [fix]导出的文件名切换为中英文可切换的模式 2022-06-29 12:55:25 +08:00
zer0Black df6a017c2a [fix]Bug 55076 发布版本--应提示具体的版本信息 2022-06-29 12:29:16 +08:00
zer0Black 2f1d9b3941 上报库的提示语句修改 2022-06-29 12:16:55 +08:00
zer0Black 9caa359d2a 发送的消息,项目名按照 车型名称-年 市场补全 2022-06-29 10:55:38 +08:00
zer0Black d8280128a2 修复项目名称前缺少空格的问题 2022-06-29 10:42:54 +08:00
zer0Black 0f880a0f59 数据库长度改动提交 2022-06-23 09:57:03 +08:00
zer0Black 918ef92da8 Merge remote-tracking branch 'origin/fix_bug_first_stage' into fix_bug_first_stage 2022-06-21 22:28:30 +08:00
zer0Black f4e8300bc7 上线数据库更新 2022-06-21 22:28:06 +08:00
zer0Black b02708c37c 第三阶段开发的数据库变更记录 2022-06-21 22:22:12 +08:00
zer0Black 4182b4df14 合并master数据 2022-06-21 22:21:07 +08:00
zer0Black 6059d64435 添加一阶段的改动sql记录 2022-06-21 21:21:57 +08:00
zer0Black bceac949ec 上线sql提交 2022-06-21 21:20:46 +08:00
zer0Black ac66147629 重新提交最新的数据库 2022-06-18 16:25:12 +08:00
zer0Black 621e3d5ab2 Merge remote-tracking branch 'origin/fix_bug_first_stage' into fix_bug_first_stage
# Conflicts:
#	jero-boot/db/蔚来标准sql/laws_weilai.sql
2022-06-18 16:21:16 +08:00
zer0Black b3cca6ecec 人员查询组件处理查询人的数据 2022-06-18 16:18:13 +08:00
zer0Black 4682901bb6 设置创建人处理查询人的数据 2022-06-18 16:18:13 +08:00
zer0Black 873a776f10 虚拟清单创建人接口提交 2022-06-18 16:18:12 +08:00
zer0Black d36055e2ac 去掉数据库文件,从分支上补充 2022-06-18 16:16:48 +08:00
zer0Black 425d712e71 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	jero-boot/db/蔚来标准sql/laws_weilai.sql
2022-06-18 16:16:33 +08:00
zer0Black 03ef50db0f 去掉数据库文件,从分支上补充 2022-06-18 16:16:21 +08:00
zer0Black e4eaf4b131 数据库重新补充 2022-06-18 16:12:07 +08:00
zer0Black e201e915ef 人员查询组件处理查询人的数据 2022-06-18 16:05:36 +08:00
zer0Black 6d3b3a51c4 设置创建人处理查询人的数据 2022-06-18 16:03:27 +08:00
zer0Black 0f745bf3d6 虚拟清单创建人接口提交 2022-06-18 15:41:51 +08:00
zer0Black 6537cf0b29 数据库提交 2022-06-17 17:23:06 +08:00
zer0Black b2a1206b05 数据库角色表补充 2022-06-17 15:03:44 +08:00
zer0Black d9351b5746 Merge remote-tracking branch 'origin/master' 2022-06-17 10:32:32 +08:00
zer0Black 2cf6e7e02f 角色补充 2022-06-17 10:32:19 +08:00
zer0Black f2345c8b46 更新数据库,补充了角色权限 2022-06-16 21:14:28 +08:00
zer0Black 396ae0fe2c 更新数据库,补充了角色权限 2022-06-16 20:58:26 +08:00
zer0Black dd6168c739 Merge remote-tracking branch 'origin/master' 2022-06-16 13:27:22 +08:00
zer0Black f50320bc27 更新数据库 2022-06-16 12:32:46 +08:00
zer0Black 314311275d 在dev环境上开发 2022-06-16 11:30:47 +08:00
zer0Black 9feb26d2dd 提交正式的数据库 2022-06-15 12:09:19 +08:00
zer0Black e1bf4b8103 Merge remote-tracking branch 'origin/master' 2022-06-14 13:05:48 +08:00
zer0Black 69f55ce1a5 上传文件的大小限制 2022-06-14 13:05:09 +08:00
zer0Black b5a4037208 强化导致的bug 2022-06-14 10:07:57 +08:00
zer0Black 28e897de63 标准数据库提交 2022-06-12 13:16:19 +08:00
zer0Black 0a0ce7a893 去除无效打印 2022-06-11 20:45:34 +08:00
zer0Black eac4512cf6 处理各位因为类型强制转换为空校验导致的问题 2022-06-11 20:43:03 +08:00
zer0Black bbd1eb20f9 去除不需要的sql 2022-06-11 13:55:41 +08:00
zer0Black 7687109d67 提交工作流sql和清除工作流的业务 2022-06-11 13:54:52 +08:00
zer0Black 356bb6c9a0 Merge remote-tracking branch 'origin/master' 2022-06-11 13:41:45 +08:00
zer0Black 55acd6c0da 分类字典的查询修改
补充蔚来标准的sql
2022-06-11 13:40:52 +08:00
zer0Black 4a81fc66bd 分类字段返回的bug 2022-06-11 13:31:50 +08:00
zer0Black 2dde012573 Merge remote-tracking branch 'origin/master' 2022-06-11 13:31:12 +08:00
zer0Black 54dbf553a7 处理标签内容树状结构不对的问题 2022-06-11 13:31:03 +08:00
zer0Black 429ae2ec06 sso测试地址更换 2022-06-07 17:33:31 +08:00
zer0Black a0b12204dd 去掉标签里无意义的@Dict注解 2022-05-16 13:31:15 +08:00
zer0Black 9a97920cec 更新aliyun的maven地址 2022-04-07 12:57:03 +08:00