Commit Graph

204 Commits

Author SHA1 Message Date
pepsi
bf16f45eda pom modify 2022-10-22 17:47:53 +08:00
pepsi
42f3a7a9de ignore jsonignore annotation 2022-10-22 17:39:24 +08:00
彭健
a56aa1d029 Merge branch 'uat' into 'planz'
ignore jsonignore annotation

See merge request infra/xlog!55
2022-10-22 06:04:23 +00:00
彭健
fb1841fd6c Merge branch 'test' into 'dev'
Test

See merge request infra/xlog!54
2022-10-22 06:03:57 +00:00
彭健
7160b07214 Merge branch 'uat' into 'test'
Uat

See merge request infra/xlog!53
2022-10-22 06:03:29 +00:00
pepsi
9b06c6318b ignore jsonignore annotation 2022-10-22 13:58:51 +08:00
彭健
31941a7c66 Merge branch 'uat' into 'planz'
Uat

See merge request infra/xlog!52
2022-10-20 11:35:31 +00:00
彭健
0c4a83fcc7 Merge branch 'test' into 'uat'
Test

See merge request infra/xlog!51
2022-10-20 11:35:07 +00:00
彭健
027fdadf83 Merge branch 'dev' into 'test'
Dev

See merge request infra/xlog!50
2022-10-20 11:34:36 +00:00
彭健
12308cd836 Merge branch 'develop/oprlog_modify/221014' into 'dev'
modify svc name

See merge request infra/xlog!49
2022-10-20 11:34:07 +00:00
pepsi
25898b9001 modify svc name 2022-10-20 19:32:53 +08:00
彭健
b96f2099fd Merge branch 'uat' into 'planz'
Uat

See merge request infra/xlog!48
2022-10-20 02:30:15 +00:00
彭健
f09cc28e22 Merge branch 'test' into 'uat'
Test

See merge request infra/xlog!47
2022-10-19 10:12:58 +00:00
彭健
4f93eb50c2 Merge branch 'test' into 'planz'
Test

See merge request infra/xlog!46
2022-10-19 10:11:57 +00:00
彭健
e6b74da6a2 Merge branch 'dev' into 'test'
Dev

See merge request infra/xlog!45
2022-10-19 10:11:26 +00:00
彭健
397b557493 Merge branch 'develop/oprlog_modify/221014' into 'dev'
modify svc name

See merge request infra/xlog!44
2022-10-19 10:10:59 +00:00
pepsi
71a8dac2cf modify svc name 2022-10-19 17:59:05 +08:00
彭健
c7f254f607 Merge branch 'test' into 'uat'
Test

See merge request infra/xlog!43
2022-10-19 06:43:37 +00:00
彭健
3da596035c Merge branch 'dev' into 'test'
Dev

See merge request infra/xlog!42
2022-10-19 02:14:43 +00:00
彭健
c22431740d Merge branch 'develop/oprlog_modify/221014' into 'dev'
ignore dto

See merge request infra/xlog!41
2022-10-19 02:12:42 +00:00
pepsi
bfe4916b92 ignore dto 2022-10-19 10:12:03 +08:00
彭健
8b24e8dcf9 Merge branch 'test' into 'planz'
Test

See merge request infra/xlog!39
2022-10-18 02:36:44 +00:00
彭健
d1f7bd4abc Merge branch 'dev' into 'test'
Dev

See merge request infra/xlog!38
2022-10-18 02:35:57 +00:00
彭健
ad7466f0f1 Merge branch 'develop/oprlog_modify/221014' into 'dev'
modify client service name for k8s find

See merge request infra/xlog!37
2022-10-18 02:34:45 +00:00
pepsi
1beaa24ee5 modify client service name for k8s find 2022-10-18 10:33:41 +08:00
彭健
4c58425f48 Merge branch 'test' into 'planz'
Test

See merge request infra/xlog!36
2022-10-17 06:25:12 +00:00
彭健
7150384971 Merge branch 'dev' into 'test'
Dev

See merge request infra/xlog!35
2022-10-17 06:24:38 +00:00
彭健
f8b2541dfc Merge branch 'develop/oprlog_modify/221014' into 'dev'
add query condition

See merge request infra/xlog!34
2022-10-17 06:24:17 +00:00
pepsi
3f772d8cc1 add query condition 2022-10-17 14:23:00 +08:00
彭健
69659d131f Merge branch 'test' into 'uat'
Test

See merge request infra/xlog!33
2022-10-15 06:59:32 +00:00
彭健
240e004d90 Merge branch 'test' into 'planz'
Test

See merge request infra/xlog!32
2022-10-14 08:57:56 +00:00
彭健
a7db4aa4d8 Merge branch 'dev' into 'test'
Dev

See merge request infra/xlog!31
2022-10-14 08:28:52 +00:00
彭健
27684677d3 Merge branch 'develop/oprlog_modify/221014' into 'dev'
add new field for operate log

See merge request infra/xlog!30
2022-10-14 08:28:15 +00:00
pepsi
d3b29ea2fe modify pom 2022-10-14 16:27:02 +08:00
pepsi
1a61f6f395 add new field for operate log 2022-10-14 14:41:36 +08:00
彭健
9c60ae9617 Merge branch 'develop/oprlog_modify/221014' into 'test'
add new field for operate log

See merge request infra/xlog!29
2022-10-13 11:20:59 +00:00
彭健
8bd9fd78f9 Merge branch 'develop/oprlog_modify/221014' into 'dev'
Develop/oprlog modify/221014

See merge request infra/xlog!28
2022-10-13 11:19:32 +00:00
pepsi
135ddca115 add new field for operate log 2022-10-13 19:18:54 +08:00
彭健
114983767c Merge branch 'develop/oprlog_modify/221014' into 'test'
Develop/oprlog modify/221014

See merge request infra/xlog!27
2022-10-13 11:12:24 +00:00
pepsi
775eea0058 Merge remote-tracking branch 'origin/test' into develop/oprlog_modify/221014 2022-10-13 19:11:22 +08:00
pepsi
7c54546d72 add new field for operate log 2022-10-13 19:10:31 +08:00
彭健
026a79d2bd Merge branch 'dev' into 'test'
Dev

See merge request infra/xlog!26
2022-10-13 11:09:32 +00:00
彭健
2c28be61e9 Merge branch 'develop/oprlog_modify/221014' into 'dev'
Develop/oprlog modify/221014

See merge request infra/xlog!25
2022-10-13 11:08:18 +00:00
pepsi
a0f02003e8 add new field for operate log 2022-10-13 19:06:59 +08:00
田立勇
f825ea37e3 Merge branch 'test' into 'planz'
Test

See merge request infra/xlog!24
2022-10-13 05:45:12 +00:00
彭健
ca02e0e9ee Merge branch 'dev' into 'test'
Dev

See merge request infra/xlog!23
2022-10-13 03:58:22 +00:00
彭健
f3787f4c6b Merge branch 'develop/oprlog_modify/221014' into 'dev'
add notNull check

See merge request infra/xlog!22
2022-10-13 03:57:32 +00:00
pepsi
0101748897 add notNull check 2022-10-13 11:56:40 +08:00
彭健
98a90c70ac Merge branch 'dev' into 'test'
Dev

See merge request infra/xlog!21
2022-10-12 10:33:03 +00:00
彭健
2747e67934 Merge branch 'develop/oprlog_modify/221014' into 'dev'
Develop/oprlog modify/221014

See merge request infra/xlog!20
2022-10-12 10:31:47 +00:00