 李雪涛
|
d301a430e7
|
合并分支 'master' 到 'dev_third_stage'
Master
查看合并请求 laws-nio/laws-weilai!132
|
2022-08-09 20:41:51 +08:00 |
|
|
李雪涛
|
8332de74d9
|
合并分支 'dev_third_stage' 到 'master'
Dev third stage
查看合并请求 laws-nio/laws-weilai!131
|
2022-08-09 20:31:08 +08:00 |
|
|
李雪涛
|
b848be87c4
|
合并分支 'fix_bug_first_stage' 到 'master'
Fix bug first stage
查看合并请求 laws-nio/laws-weilai!130
|
2022-08-09 20:30:57 +08:00 |
|
|
李雪涛
|
912e58100b
|
合并分支 'master' 到 'fix_bug_first_stage'
Master
查看合并请求 laws-nio/laws-weilai!129
|
2022-08-04 23:01:03 +08:00 |
|
|
李雪涛
|
3e44334dcd
|
合并分支 'master' 到 'dev_third_stage'
Master
查看合并请求 laws-nio/laws-weilai!128
|
2022-08-04 23:00:52 +08:00 |
|
|
李雪涛
|
c07825ff0f
|
合并分支 'master' 到 'fix_bug_first_stage'
Master
查看合并请求 laws-nio/laws-weilai!127
|
2022-08-04 22:59:44 +08:00 |
|
|
李雪涛
|
00d706de8d
|
合并分支 'master' 到 'dev_third_stage'
Master
查看合并请求 laws-nio/laws-weilai!126
|
2022-08-04 22:59:32 +08:00 |
|
|
李雪涛
|
d75f0d2a94
|
合并分支 'dev_third_stage' 到 'master'
Dev third stage
查看合并请求 laws-nio/laws-weilai!125
|
2022-08-04 22:34:44 +08:00 |
|
|
李雪涛
|
792b194a20
|
合并分支 'fix_bug_first_stage' 到 'master'
Fix bug first stage
查看合并请求 laws-nio/laws-weilai!124
|
2022-08-04 22:34:33 +08:00 |
|
|
李雪涛
|
4d673287bd
|
合并分支 'master' 到 'fix_bug_first_stage'
Master
查看合并请求 laws-nio/laws-weilai!122
|
2022-08-03 20:28:03 +08:00 |
|
|
李雪涛
|
e8a8631448
|
合并分支 'master' 到 'dev_third_stage'
Master
查看合并请求 laws-nio/laws-weilai!121
|
2022-08-03 20:27:27 +08:00 |
|
|
李雪涛
|
aaf53c52e8
|
合并分支 'dev_third_stage' 到 'master'
Dev third stage
查看合并请求 laws-nio/laws-weilai!120
|
2022-08-03 20:27:07 +08:00 |
|
|
李雪涛
|
3f747facd2
|
合并分支 'fix_bug_first_stage' 到 'master'
Fix bug first stage
查看合并请求 laws-nio/laws-weilai!119
|
2022-08-03 20:26:55 +08:00 |
|
|
李雪涛
|
3c3916ba0c
|
合并分支 'master' 到 'fix_bug_first_stage'
Master
查看合并请求 laws-nio/laws-weilai!118
|
2022-07-31 10:43:26 +08:00 |
|
|
李雪涛
|
b2567b7acb
|
合并分支 'master' 到 'dev_third_stage'
Master
查看合并请求 laws-nio/laws-weilai!117
|
2022-07-31 10:43:13 +08:00 |
|
|
李雪涛
|
4d0d508893
|
合并分支 'fix_bug_first_stage' 到 'master'
Fix bug first stage
查看合并请求 laws-nio/laws-weilai!116
|
2022-07-31 10:43:00 +08:00 |
|
|
李雪涛
|
544fd76cc5
|
合并分支 'dev_third_stage' 到 'master'
Dev third stage
查看合并请求 laws-nio/laws-weilai!115
|
2022-07-31 10:42:50 +08:00 |
|
|
李雪涛
|
b9177b79a5
|
合并分支 'fix_bug_first_stage' 到 'master'
Fix bug first stage
查看合并请求 laws-nio/laws-weilai!111
|
2022-07-25 19:41:59 +08:00 |
|
|
李雪涛
|
5df2b4cd87
|
合并分支 'dev_third_stage' 到 'master'
Dev third stage
查看合并请求 laws-nio/laws-weilai!110
|
2022-07-25 19:41:47 +08:00 |
|
|
李雪涛
|
9ff9ec737e
|
合并分支 'master' 到 'fix_bug_first_stage'
Master
查看合并请求 laws-nio/laws-weilai!109
|
2022-07-24 17:34:05 +08:00 |
|
|
李雪涛
|
676c77469b
|
合并分支 'master' 到 'dev_third_stage'
Master
查看合并请求 laws-nio/laws-weilai!108
|
2022-07-24 17:33:38 +08:00 |
|
|
李雪涛
|
74a513aa18
|
合并分支 'fix_bug_first_stage' 到 'master'
合并分支 'master' 到 'fix_bug_first_stage'
查看合并请求 laws-nio/laws-weilai!107
|
2022-07-24 17:33:25 +08:00 |
|
|
李雪涛
|
f3f9726477
|
合并分支 'dev_third_stage' 到 'master'
Dev third stage
查看合并请求 laws-nio/laws-weilai!106
|
2022-07-24 17:33:13 +08:00 |
|
|
李雪涛
|
8714bc0bbd
|
合并分支 'master' 到 'dev_third_stage'
Master
查看合并请求 laws-nio/laws-weilai!105
|
2022-07-24 17:32:52 +08:00 |
|
|
李雪涛
|
51a18944ec
|
合并分支 'master' 到 'fix_bug_first_stage'
Master
查看合并请求 laws-nio/laws-weilai!104
|
2022-07-22 18:26:55 +08:00 |
|
|
李雪涛
|
143d0a2ca3
|
合并分支 'dev_third_stage' 到 'master'
Dev third stage
查看合并请求 laws-nio/laws-weilai!103
|
2022-07-22 18:24:02 +08:00 |
|
|
李雪涛
|
591f030112
|
合并分支 'fix_bug_first_stage' 到 'master'
Fix bug first stage
查看合并请求 laws-nio/laws-weilai!102
|
2022-07-22 18:23:54 +08:00 |
|
|
李雪涛
|
c2b46551c0
|
合并分支 'master' 到 'dev_third_stage'
Master
查看合并请求 laws-nio/laws-weilai!98
|
2022-07-20 20:25:05 +08:00 |
|
|
李雪涛
|
10f441edef
|
合并分支 'master' 到 'fix_bug_first_stage'
Master
查看合并请求 laws-nio/laws-weilai!97
|
2022-07-20 20:24:53 +08:00 |
|
|
李雪涛
|
b71b1f7012
|
合并分支 'master' 到 'fix_bug_first_stage'
Master
查看合并请求 laws-nio/laws-weilai!94
|
2022-07-17 21:11:11 +08:00 |
|
|
李雪涛
|
d117756534
|
合并分支 'master' 到 'dev_third_stage'
Master
查看合并请求 laws-nio/laws-weilai!93
|
2022-07-17 21:10:57 +08:00 |
|
|
李雪涛
|
d4d78019c3
|
合并分支 'fix_bug_first_stage' 到 'master'
Fix bug first stage
查看合并请求 laws-nio/laws-weilai!92
|
2022-07-17 21:10:26 +08:00 |
|
|
lixuetao
|
a29e1f86cd
|
法规部分的翻译进行修改
|
2022-07-17 21:09:32 +08:00 |
|
|
lixuetao
|
3b6aedc3d1
|
增加参数名称到100，参数说明到2000的sql提交
|
2022-07-17 18:57:48 +08:00 |
|
|
lixuetao
|
15fbadfd8a
|
增加参数名称到100，参数说明到2000
|
2022-07-17 18:50:32 +08:00 |
|
|
lixuetao
|
db4a53621a
|
修复编号查询无法截断数字的问题
|
2022-07-16 18:51:55 +08:00 |
|
|
lixuetao
|
f94ead44bc
|
一部分英文调整中英文大写的问题
|
2022-07-15 11:12:00 +08:00 |
|
|
李雪涛
|
128c501e19
|
合并分支 'dev_third_stage' 到 'master'
Dev third stage
查看合并请求 laws-nio/laws-weilai!78
|
2022-07-12 15:19:56 +08:00 |
|
|
李雪涛
|
42da284c26
|
合并分支 'fix_bug_first_stage' 到 'master'
Fix bug first stage
查看合并请求 laws-nio/laws-weilai!77
|
2022-07-12 15:18:33 +08:00 |
|
|
李雪涛
|
9233ca39b9
|
合并分支 'dev_third_stage' 到 'master'
Dev third stage
查看合并请求 laws-nio/laws-weilai!76
|
2022-07-12 09:35:02 +08:00 |
|
|
李雪涛
|
3dc91f6e16
|
合并分支 'master' 到 'fix_bug_first_stage'
Master
查看合并请求 laws-nio/laws-weilai!74
|
2022-07-09 19:43:16 +08:00 |
|
|
李雪涛
|
6c27fd2411
|
合并分支 'master' 到 'dev_third_stage'
Master
查看合并请求 laws-nio/laws-weilai!73
|
2022-07-09 19:43:04 +08:00 |
|
|
李雪涛
|
6c59916084
|
合并分支 'dev_third_stage' 到 'master'
Dev third stage
查看合并请求 laws-nio/laws-weilai!72
|
2022-07-09 19:42:51 +08:00 |
|
|
李雪涛
|
a7071d1b99
|
合并分支 'master' 到 'fix_bug_first_stage'
Master
查看合并请求 laws-nio/laws-weilai!64
|
2022-07-09 13:07:08 +08:00 |
|
|
李雪涛
|
5b9bc49d5e
|
合并分支 'master' 到 'dev_third_stage'
Master
查看合并请求 laws-nio/laws-weilai!63
|
2022-07-09 13:06:57 +08:00 |
|
|
李雪涛
|
0a4585dc18
|
合并分支 'dev_third_stage' 到 'master'
合并分支 'master' 到 'dev_third_stage'
查看合并请求 laws-nio/laws-weilai!62
|
2022-07-09 13:06:41 +08:00 |
|
|
李雪涛
|
f9d5d3021b
|
合并分支 'fix_bug_first_stage' 到 'master'
Fix bug first stage
查看合并请求 laws-nio/laws-weilai!61
|
2022-07-09 13:06:15 +08:00 |
|
|
李雪涛
|
d382ce26e0
|
合并分支 'master' 到 'fix_bug_first_stage'
Master
查看合并请求 laws-nio/laws-weilai!60
|
2022-07-09 11:16:48 +08:00 |
|
|
李雪涛
|
2caaf8cc3e
|
合并分支 'master' 到 'dev_third_stage'
Master
查看合并请求 laws-nio/laws-weilai!59
|
2022-07-09 11:16:36 +08:00 |
|
|
李雪涛
|
eaef749f0a
|
合并分支 'fix_bug_first_stage' 到 'master'
Fix bug first stage
查看合并请求 laws-nio/laws-weilai!57
|
2022-07-09 11:13:37 +08:00 |
|
|
lixuetao
|
4b8e3e64ad
|
Merge remote-tracking branch 'origin/fix_bug_first_stage' into fix_bug_first_stage
|
2022-07-07 12:05:50 +08:00 |
|
|
lixuetao
|
6575747310
|
飞书消息调整
|
2022-07-07 12:04:45 +08:00 |
|
|
lixuetao
|
46a7c2d630
|
去掉乱码
|
2022-07-06 22:14:05 +08:00 |
|
|
李雪涛
|
addbc8b42c
|
合并分支 'master' 到 'dev_third_stage'
Master
查看合并请求 laws-nio/laws-weilai!52
|
2022-07-06 21:28:40 +08:00 |
|
|
李雪涛
|
518d572491
|
合并分支 'master' 到 'fix_bug_first_stage'
Master
查看合并请求 laws-nio/laws-weilai!51
|
2022-07-06 21:28:23 +08:00 |
|
|
李雪涛
|
7438de7f7d
|
合并分支 'dev_third_stage' 到 'master'
Dev third stage
查看合并请求 laws-nio/laws-weilai!50
|
2022-07-06 21:26:36 +08:00 |
|
|
李雪涛
|
73467eba69
|
合并分支 'master' 到 'fix_bug_first_stage'
Master
查看合并请求 laws-nio/laws-weilai!47
|
2022-07-05 19:51:00 +08:00 |
|
|
李雪涛
|
1799b5da83
|
合并分支 'master' 到 'dev_third_stage'
Master
查看合并请求 laws-nio/laws-weilai!46
|
2022-07-05 19:50:47 +08:00 |
|
|
lixuetao
|
af9bd856a3
|
Merge branch 'dev_third_stage'
|
2022-07-05 19:49:26 +08:00 |
|
|
lixuetao
|
4b092fc07c
|
Merge branch 'fix_bug_first_stage'
# Conflicts:
# jero-web/src/components/CollectionType/index.vue
|
2022-07-05 19:48:17 +08:00 |
|
|
lixuetao
|
7ddac7eb75
|
Merge branch 'dev_third_stage'
# Conflicts:
# jero-web/src/common/lang/en-us.js
# jero-web/src/common/lang/zh-cn.js
|
2022-07-05 15:34:57 +08:00 |
|
|
李雪涛
|
c3c3baefe5
|
合并分支 'fix_bug_first_stage' 到 'master'
Fix bug first stage
查看合并请求 laws-nio/laws-weilai!43
|
2022-07-05 15:30:04 +08:00 |
|
|
李雪涛
|
7bc2e9cb22
|
合并分支 'dev_third_stage' 到 'master'
Dev third stage
查看合并请求 laws-nio/laws-weilai!42
|
2022-07-03 14:52:03 +08:00 |
|
|
李雪涛
|
9ff4515532
|
合并分支 'master' 到 'dev_third_stage'
Master
查看合并请求 laws-nio/laws-weilai!41
|
2022-07-03 12:42:03 +08:00 |
|
|
李雪涛
|
727aae74f5
|
合并分支 'master' 到 'fix_bug_first_stage'
Master
查看合并请求 laws-nio/laws-weilai!40
|
2022-07-03 12:41:48 +08:00 |
|
|
李雪涛
|
4f64aa951c
|
合并分支 'dev_third_stage' 到 'master'
Dev third stage
查看合并请求 laws-nio/laws-weilai!39
|
2022-07-03 12:41:20 +08:00 |
|
|
李雪涛
|
6c94d5412a
|
合并分支 'fix_bug_first_stage' 到 'master'
修改禅道已知bug
查看合并请求 laws-nio/laws-weilai!38
|
2022-07-03 12:41:10 +08:00 |
|
|
李雪涛
|
54149230b9
|
合并分支 'fix_bug_first_stage' 到 'master'
修改禅道已知bug
查看合并请求 laws-nio/laws-weilai!37
|
2022-07-02 16:53:53 +08:00 |
|
|
李雪涛
|
f592a032a4
|
合并分支 'fix_bug_first_stage' 到 'master'
Fix bug first stage
查看合并请求 laws-nio/laws-weilai!36
|
2022-07-02 14:51:21 +08:00 |
|
|
李雪涛
|
52db5c3df3
|
合并分支 'fix_bug_first_stage' 到 'master'
Fix bug first stage
查看合并请求 laws-nio/laws-weilai!35
|
2022-07-02 13:48:41 +08:00 |
|
|
李雪涛
|
448910a293
|
合并分支 'fix_bug_first_stage' 到 'master'
记录部署信息
查看合并请求 laws-nio/laws-weilai!34
|
2022-07-02 11:59:12 +08:00 |
|
|
李雪涛
|
fcb15fbb22
|
合并分支 'fix_bug_first_stage' 到 'master'
Fix bug first stage
查看合并请求 laws-nio/laws-weilai!33
|
2022-07-02 09:21:50 +08:00 |
|
|
李雪涛
|
ce554d686e
|
合并分支 'master' 到 'fix_bug_first_stage'
Master
查看合并请求 laws-nio/laws-weilai!32
|
2022-07-01 15:22:28 +08:00 |
|
|
李雪涛
|
f8d786487e
|
合并分支 'master' 到 'dev_third_stage'
Master
查看合并请求 laws-nio/laws-weilai!31
|
2022-07-01 15:22:15 +08:00 |
|
|
李雪涛
|
7afd56d019
|
合并分支 'fix_bug_first_stage' 到 'master'
Fix bug first stage
查看合并请求 laws-nio/laws-weilai!30
|
2022-07-01 15:21:34 +08:00 |
|
|
李雪涛
|
44161c5bd9
|
合并分支 'dev_third_stage' 到 'master'
Dev third stage
查看合并请求 laws-nio/laws-weilai!29
|
2022-07-01 15:15:37 +08:00 |
|
|
李雪涛
|
7431729b4b
|
合并分支 'fix_bug_first_stage' 到 'master'
Fix bug first stage
查看合并请求 laws-nio/laws-weilai!28
|
2022-07-01 15:15:24 +08:00 |
|
|
李雪涛
|
c2972f49d5
|
合并分支 'master' 到 'dev_third_stage'
Master
查看合并请求 laws-nio/laws-weilai!27
|
2022-07-01 15:13:59 +08:00 |
|
|
李雪涛
|
61d64f1e29
|
合并分支 'master' 到 'fix_bug_first_stage'
Master
查看合并请求 laws-nio/laws-weilai!26
|
2022-07-01 15:13:46 +08:00 |
|
|
李雪涛
|
f6146a89a1
|
合并分支 'fix_bug_first_stage' 到 'master'
Fix bug first stage
查看合并请求 laws-nio/laws-weilai!22
|
2022-07-01 15:00:00 +08:00 |
|
|
lixuetao
|
4dc260396a
|
Merge remote-tracking branch 'origin/dev_third_stage' into dev_third_stage
|
2022-06-30 17:37:12 +08:00 |
|
|
lixuetao
|
2d32bcfb3c
|
模板复制的问题
|
2022-06-30 17:36:59 +08:00 |
|
|
lixuetao
|
32d0e0581e
|
认证类型部分的编号名称错误进行修改
|
2022-06-30 16:09:56 +08:00 |
|
|
lixuetao
|
609441e1bb
|
10种控件的组件name修改
|
2022-06-30 12:44:52 +08:00 |
|
|
lixuetao
|
f146a71ef7
|
Merge remote-tracking branch 'origin/dev_third_stage' into dev_third_stage
|
2022-06-30 12:14:19 +08:00 |
|
|
lixuetao
|
92536a12f0
|
处理参数收集代码文件所在的位置
|
2022-06-30 12:13:45 +08:00 |
|
|
lixuetao
|
4fa98da31a
|
复制参数清单问题功能完善
|
2022-06-30 11:43:27 +08:00 |
|
|
lixuetao
|
4473fd9489
|
按钮的英文叠在一起的问题解决
|
2022-06-30 11:16:45 +08:00 |
|
|
lixuetao
|
445a1c03f2
|
添加判断配置，再决定能否进入收集清单的问题
|
2022-06-30 10:53:28 +08:00 |
|
|
lixuetao
|
f43ddc3617
|
Merge remote-tracking branch 'origin/dev_third_stage' into dev_third_stage
|
2022-06-30 09:57:15 +08:00 |
|
|
lixuetao
|
d2cac8d260
|
维护配置信息添加中英文
|
2022-06-30 09:57:06 +08:00 |
|
|
lixuetao
|
4cbc6a045d
|
搜索的问题
|
2022-06-29 14:56:38 +08:00 |
|
|
lixuetao
|
d660cc229f
|
Merge remote-tracking branch 'origin/fix_bug_first_stage' into fix_bug_first_stage
|
2022-06-29 14:55:58 +08:00 |
|
|
lixuetao
|
50bea5470d
|
控制项目库的删除权限
|
2022-06-29 14:55:39 +08:00 |
|
|
李雪涛
|
07b9e19d36
|
合并分支 'fix_bug_first_stage' 到 'master'
Fix bug first stage
查看合并请求 laws-nio/laws-weilai!18
|
2022-06-21 22:29:02 +08:00 |
|
|
李雪涛
|
c54b7eeaa8
|
合并分支 'master' 到 'fix_bug_first_stage'
Master
查看合并请求 laws-nio/laws-weilai!16
|
2022-06-21 21:24:01 +08:00 |
|
|
李雪涛
|
c530d98f47
|
合并分支 'fix_bug_first_stage' 到 'master'
Fix bug first stage
查看合并请求 laws-nio/laws-weilai!14
|
2022-06-21 21:22:35 +08:00 |
|
|
李雪涛
|
b67fa29016
|
合并分支 'master' 到 'dev_third_stage'
Master
查看合并请求 laws-nio/laws-weilai!9
|
2022-06-18 16:28:56 +08:00 |
|
|
李雪涛
|
25049a7df1
|
合并分支 'master' 到 'fix_bug_first_stage'
合并分支 'fix_bug_first_stage' 到 'master'
查看合并请求 laws-nio/laws-weilai!8
|
2022-06-18 16:27:50 +08:00 |
|
|
李雪涛
|
1273543be1
|
合并分支 'fix_bug_first_stage' 到 'master'
Fix bug first stage
查看合并请求 laws-nio/laws-weilai!7
|
2022-06-18 16:26:03 +08:00 |
|