 sunjun
|
720bc02308
|
sprint_59471
|
2022-07-06 03:23:53 +00:00 |
|
|
王怡栋
|
c7b10921f4
|
Merge branch 'sprint/211_liumengyi_59477' into 'master'
* Finish task #59477.
See merge request easycorp/zentaopms!4364
|
2022-07-06 01:50:59 +00:00 |
|
|
liumengyi
|
45183de128
|
* Add annotation.
|
2022-07-06 09:49:20 +08:00 |
|
|
王怡栋
|
e97acef6d9
|
Merge branch 'sprint/211_liumengyi_fixbug' into 'master'
* Fix bug #24753,#24754.
See merge request easycorp/zentaopms!4361
|
2022-07-06 01:48:53 +00:00 |
|
|
王怡栋
|
4eb9fb5904
|
Merge branch 'master_xieqiyu_23949' into 'master'
* Fix bug#23949.
See merge request easycorp/zentaopms!4360
|
2022-07-06 01:48:28 +00:00 |
|
|
王怡栋
|
8c8fd29f34
|
Merge branch 'sprint/master_zhouxudong_59533' into 'master'
* Finish task #59533.
See merge request easycorp/zentaopms!4363
|
2022-07-06 01:44:41 +00:00 |
|
|
王怡栋
|
e3a045ac61
|
Merge branch 'sprint/master_zhouxudong_59748' into 'master'
Sprint/master zhouxudong 59748
See merge request easycorp/zentaopms!4366
|
2022-07-06 01:40:46 +00:00 |
|
|
zhouxudong
|
ae9ac7d0c8
|
* Finish task #59748.
|
2022-07-06 01:36:53 +00:00 |
|
|
liumengyi
|
500302a590
|
* Fix bug of task #59477.
|
2022-07-06 09:28:10 +08:00 |
|
|
孙广明
|
9a6689837b
|
* Add date to cfd.
|
2022-07-06 09:16:36 +08:00 |
|
|
孙广明
|
6fe5ef5a23
|
Merge branch 'sprint_59473' into 'master'
Sprint 59473
See merge request easycorp/zentaopms!4362
|
2022-07-06 01:13:32 +00:00 |
|
|
zhouxudong
|
7a9f685ecf
|
* Finish task #59533.
|
2022-07-06 01:13:31 +00:00 |
|
|
sunjun
|
e5ed8133b1
|
sprint_59473
|
2022-07-06 01:06:35 +00:00 |
|
|
liumengyi
|
4324454636
|
* Fix bug of task #59477.
|
2022-07-06 08:52:27 +08:00 |
|
|
孙广明
|
cbe74dd653
|
* Code for cfd details.
|
2022-07-06 08:44:57 +08:00 |
|
|
liumengyi
|
6464887f89
|
* Fix bug #24753.
|
2022-07-06 08:42:21 +08:00 |
|
|
liumengyi
|
b5608fb799
|
* Fix bug #24754.
|
2022-07-06 08:41:51 +08:00 |
|
|
sunjun
|
d34e8f8638
|
sprint_59473
|
2022-07-06 00:29:14 +00:00 |
|
|
李玉春
|
7838ff2ac6
|
Merge branch 'cyy_gitlab' into 'master'
* Modify gitlab access check.
See merge request easycorp/zentaopms!4346
|
2022-07-06 00:17:14 +00:00 |
|
|
sunjun
|
84e078c1b2
|
sprint_59473
|
2022-07-05 14:35:33 +00:00 |
|
|
liumengyi
|
7bb148a48b
|
* Fix bug of task #59477.
|
2022-07-05 22:17:19 +08:00 |
|
|
xieqiyu
|
a37d7e3ae8
|
* Fix bug#23949.
|
2022-07-05 22:02:45 +08:00 |
|
|
孙广明
|
781259ee6f
|
* Code for CFD.
|
2022-07-05 21:11:03 +08:00 |
|
|
王怡栋
|
92c6d5f243
|
Merge branch 'master_xieqiyu_kanban' into 'master'
Master xieqiyu kanban
See merge request easycorp/zentaopms!4356
|
2022-07-05 09:21:23 +00:00 |
|
|
孙广明
|
d175ae0f5e
|
Merge branch 'master' into 'liyuchun_59437'
# Conflicts:
# module/repo/control.php
|
2022-07-05 09:20:43 +00:00 |
|
|
孙广明
|
109e977776
|
Merge branch 'liyuchun_59450' into 'master'
* Finish task #59450,59449.
See merge request easycorp/zentaopms!4357
|
2022-07-05 09:08:15 +00:00 |
|
|
liyuchun
|
04194dbe56
|
* Finish task #59450,59449.
|
2022-07-05 09:06:35 +00:00 |
|
|
wangyidong
|
b35fe6c6a0
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms
|
2022-07-05 16:57:49 +08:00 |
|
|
wangyidong
|
18c2a6e80e
|
* code for bug #24758.
|
2022-07-05 16:57:34 +08:00 |
|
|
xieqiyu
|
44c9af6d18
|
* Code for task#59544.
|
2022-07-05 16:56:06 +08:00 |
|
|
孙广明
|
1166775664
|
Merge branch 'sgm_kanban' into 'master'
* Code for cfd.
See merge request easycorp/zentaopms!4355
|
2022-07-05 08:53:26 +00:00 |
|
|
孙广明
|
9ed8604daf
|
* Code for cfd.
|
2022-07-05 16:52:47 +08:00 |
|
|
王怡栋
|
02e43e864a
|
Merge branch 'sprint/231_guofeilong_59703' into 'master'
* Fix error in ClassName
See merge request easycorp/zentaopms!4354
|
2022-07-05 08:44:58 +00:00 |
|
|
liyuchun
|
8a3d924e2b
|
* Finish task #59451.
|
2022-07-05 08:42:48 +00:00 |
|
|
guofeilong
|
f043a6f4ec
|
* Fix error in ClassName
|
2022-07-05 08:42:12 +00:00 |
|
|
王怡栋
|
b460e7f9de
|
Merge branch 'sprint/master_zhouxudong_59537' into 'master'
* Finish task #59536 #59537.
See merge request easycorp/zentaopms!4351
|
2022-07-05 08:31:52 +00:00 |
|
|
王怡栋
|
9ea825b992
|
Merge branch 'sprint/231_guofeilong_59703' into 'master'
fix input error
See merge request easycorp/zentaopms!4352
|
2022-07-05 08:31:04 +00:00 |
|
|
王怡栋
|
bc00e9f66c
|
Merge branch 'sprint/211_tianshujie_59475' into 'master'
Sprint/211 tianshujie 59475
See merge request easycorp/zentaopms!4353
|
2022-07-05 08:30:47 +00:00 |
|
|
sunjun
|
900b52a96b
|
sprint_59473
|
2022-07-05 08:24:41 +00:00 |
|
|
tianshujie
|
64c23417d0
|
* Modify style issues.
|
2022-07-05 16:05:33 +08:00 |
|
|
sunjun
|
5b228a2604
|
sprint_59473
|
2022-07-05 08:04:57 +00:00 |
|
|
xieqiyu
|
c9db63d869
|
* Code for task#59544. Update split comlmn.
|
2022-07-05 16:03:00 +08:00 |
|
|
guofeilong
|
b5c87be0e0
|
fix input error
|
2022-07-05 08:02:21 +00:00 |
|
|
tianshujie
|
b6c52c441e
|
* Finish task #59475.
|
2022-07-05 16:01:47 +08:00 |
|
|
tianshujie
|
987421cc77
|
* Finish task #59475.
|
2022-07-05 15:44:09 +08:00 |
|
|
sunjun
|
2a28c13c7e
|
sprint_59473
|
2022-07-05 07:39:55 +00:00 |
|
|
王怡栋
|
1ab6ed7a95
|
Merge branch 'sprint/master_zhouxudong_59522' into 'master'
* Finish task #59518 #59522.
See merge request easycorp/zentaopms!4350
|
2022-07-05 07:36:15 +00:00 |
|
|
zhouxudong
|
c23b4fe7b6
|
* Finish task #59536 #59537.
|
2022-07-05 07:34:49 +00:00 |
|
|
王怡栋
|
ac7a5c987e
|
Merge branch 'sprint/231_guofeilong_59703' into 'master'
* Finish task #59703
See merge request easycorp/zentaopms!4349
|
2022-07-05 07:34:31 +00:00 |
|
|
guofeilong
|
4d16cbf4dc
|
* fix indentation problem
|
2022-07-05 07:23:36 +00:00 |
|