 Yagami
|
3654cd3c11
|
Merge branch 'sprint/zentaopms271_lanzongjun'
|
2022-12-07 09:35:30 +08:00 |
|
|
孙广明
|
1ea5ad8245
|
Merge branch 'master_liuhong_78696' into 'master'
Master liuhong 78696
See merge request easycorp/zentaopms!6471
|
2022-12-07 01:33:32 +00:00 |
|
|
孙广明
|
d3925a1ce4
|
Merge branch 'master_xieqiyu_mergeSQL' into 'master'
* Merge SQL.
See merge request easycorp/zentaopms!6483
|
2022-12-07 01:30:34 +00:00 |
|
|
lanzongjun
|
e6df8be8a6
|
add default branch
|
2022-12-07 09:21:19 +08:00 |
|
|
lanzongjun
|
cb6f17a43e
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/zentaopms271_lanzongjun
|
2022-12-07 09:13:19 +08:00 |
|
|
Yagami
|
e5b21b632e
|
* Change execution link stories lang.
|
2022-12-07 09:10:37 +08:00 |
|
|
wangyidong
|
e3b57ed1f5
|
* code task #78915,78916.
|
2022-12-06 17:59:21 +08:00 |
|
|
wangyidong
|
90120bd37f
|
* code for task #78914.
|
2022-12-06 17:42:53 +08:00 |
|
|
王怡栋
|
6718101e3e
|
Merge branch 'sprint/xuanxuan_127' into 'master'
* add zentao bot extension.
See merge request easycorp/zentaopms!6186
|
2022-12-06 09:35:17 +00:00 |
|
|
王怡栋
|
e747ec9232
|
Merge branch 'feedback_1661' into 'master'
* Resolve feedback#1661
See merge request easycorp/zentaopms!6485
|
2022-12-06 09:34:14 +00:00 |
|
|
王怡栋
|
2c0e38cb1c
|
Merge branch 'sprint/hufangzhou_bug_30500' into 'master'
* Fix bug #30500.
See merge request easycorp/zentaopms!6484
|
2022-12-06 09:33:43 +00:00 |
|
|
王怡栋
|
142ea2617f
|
Merge branch 'sprint/hufangzhou_ticket_149' into 'master'
* Handle feedback #1666.
See merge request easycorp/zentaopms!6481
|
2022-12-06 09:32:54 +00:00 |
|
|
王怡栋
|
a6ab5060b9
|
Merge branch 'cyy_optimize' into 'master'
Cyy optimize
See merge request easycorp/zentaopms!6470
|
2022-12-06 09:31:34 +00:00 |
|
|
zenggang
|
4239813b6b
|
* Resolve feedback#1661
|
2022-12-06 09:30:48 +00:00 |
|
|
wangyidong
|
cb5af075f0
|
* adjust for upgrade.
|
2022-12-06 17:27:53 +08:00 |
|
|
lanzongjun
|
a228bfdeeb
|
resolve conflict
|
2022-12-06 17:21:18 +08:00 |
|
|
hufangzhou
|
871eb1c0a3
|
* Fix bug #30500.
|
2022-12-06 09:20:32 +00:00 |
|
|
lanzongjun
|
4cbf1397b8
|
* Finish Task #78671
|
2022-12-06 17:18:57 +08:00 |
|
|
xieqiyu
|
f1b869d003
|
* Merge SQL.
|
2022-12-06 16:59:47 +08:00 |
|
|
lanzongjun
|
55aac8c426
|
* Finish Task #78664
|
2022-12-06 16:51:58 +08:00 |
|
|
hufangzhou
|
70cc4cda66
|
* Handle feedback #1666.
|
2022-12-06 08:30:30 +00:00 |
|
|
孙广明
|
a1ab91b66b
|
Merge branch 'master_xieqiyu_78667' into 'master'
* Code for task#78667.
See merge request easycorp/zentaopms!6479
|
2022-12-06 08:09:59 +00:00 |
|
|
孙广明
|
262e4972b3
|
Merge branch 'master_xieqiyu_78669' into 'master'
Master xieqiyu 78669
See merge request easycorp/zentaopms!6478
|
2022-12-06 08:08:45 +00:00 |
|
|
xieqiyu
|
d20421ad39
|
* Code for task#78667.
|
2022-12-06 16:06:28 +08:00 |
|
|
孙广明
|
f06d508e16
|
* Finish task #78662.
|
2022-12-06 15:48:09 +08:00 |
|
|
孙广明
|
a68d09a11b
|
Merge branch 'sprint/hufangzhou_ticket_144' into 'master'
* Handle ticket #144.
See merge request easycorp/zentaopms!6477
|
2022-12-06 06:56:49 +00:00 |
|
|
hufangzhou
|
15d3437046
|
* Handle ticket #144.
|
2022-12-06 06:53:34 +00:00 |
|
|
孙广明
|
1afa8277b6
|
Merge branch 'zhouxin_ticket_fixsql' into 'master'
* Add drop table sql.
See merge request easycorp/zentaopms!6475
|
2022-12-06 06:28:19 +00:00 |
|
|
孙广明
|
20de306b8a
|
Merge branch 'lyk_feedback_1398' into 'master'
* Resolve feedback #1398.
See merge request easycorp/zentaopms!6476
|
2022-12-06 06:28:06 +00:00 |
|
|
xieqiyu
|
6f8dd9e186
|
* Code for task#78669. Add branch name in tips.
|
2022-12-06 14:27:17 +08:00 |
|
|
wangyidong
|
58596cacf1
|
* code task #78913.
|
2022-12-06 14:17:18 +08:00 |
|
|
zhouxin
|
d8e155a5ec
|
* Add drop table sql.
|
2022-12-06 06:16:05 +00:00 |
|
|
朱金勇
|
5eb1c0c228
|
Merge branch 'master_lufei_formatcode' into 'master'
* Format code and fix return value.
See merge request easycorp/zentaopms!6466
|
2022-12-06 06:05:18 +00:00 |
|
|
鲁飞
|
2f4ad5c556
|
* Format code and fix return value.
|
2022-12-06 06:05:18 +00:00 |
|
|
liuyongkai
|
069a8d4a06
|
* Resolve feedback #1398.
|
2022-12-06 13:54:54 +08:00 |
|
|
wangyidong
|
45e8ff4f1a
|
* code for task #78912.
|
2022-12-06 13:54:14 +08:00 |
|
|
孙广明
|
44511a56c8
|
Merge branch 'zhouxin_bug_30548' into 'master'
* Fix bug #30548.
See merge request easycorp/zentaopms!6474
|
2022-12-06 05:53:49 +00:00 |
|
|
zhouxin
|
10646f608b
|
* Fix bug #30548.
|
2022-12-06 05:47:19 +00:00 |
|
|
wangyidong
|
0f1de8b84f
|
* code for task #78911
|
2022-12-06 13:43:17 +08:00 |
|
|
孙广明
|
1bca37102e
|
* Fix bug #30554.
|
2022-12-06 13:40:07 +08:00 |
|
|
liuhong
|
a3893c9046
|
*Adjuct code for task #78696.
|
2022-12-06 05:11:07 +00:00 |
|
|
caoyanyi
|
c3e0f7e8b2
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms
|
2022-12-06 11:48:36 +08:00 |
|
|
caoyanyi
|
86e46d3e3e
|
* Modify bug create page style.
|
2022-12-06 11:48:04 +08:00 |
|
|
liuhong
|
377ba07d06
|
* Fix task code for #78696.
|
2022-12-06 03:28:33 +00:00 |
|
|
孙广明
|
b20b7fa781
|
Merge branch 'zhouxin_feedback_83' into 'master'
* Resolve feedback #83.
See merge request easycorp/zentaopms!6469
|
2022-12-06 02:54:04 +00:00 |
|
|
zhouxin
|
afbd5f1b0a
|
* Resolve feedback #83.
|
2022-12-06 02:42:35 +00:00 |
|
|
王怡栋
|
5f4c964d59
|
Merge branch 'zentaopms269_wyd' into 'master'
* code for task #78909.
See merge request easycorp/zentaopms!6468
|
2022-12-06 02:38:34 +00:00 |
|
|
wangyidong
|
7c8f4674cf
|
* code for task #78909.
|
2022-12-06 10:37:24 +08:00 |
|
|
xieqiyu
|
62157bf79e
|
* Code for task#78669.
|
2022-12-06 10:24:11 +08:00 |
|
|
lanzongjun
|
0adbd8e27a
|
* Finish Bug #30541
|
2022-12-06 10:16:34 +08:00 |
|