 孙广明
|
7ff5e4142b
|
* Finish task #54194.
|
2022-05-17 13:22:07 +08:00 |
|
|
孙广明
|
3d3000f06f
|
Merge branch 'sunhuawei_fixbug_22559' into 'master'
*Fix bug #22559.
See merge request easycorp/zentaopms!3439
|
2022-05-17 03:27:40 +00:00 |
|
|
孙华伟
|
628c54a838
|
*Optimize the code.
|
2022-05-17 11:26:35 +08:00 |
|
|
王怡栋
|
1ed6b45e30
|
Merge branch 'sgm_sprint190' into 'master'
Sgm sprint190
See merge request easycorp/zentaopms!3440
|
2022-05-17 03:20:36 +00:00 |
|
|
孙广明
|
59b7e2675c
|
* Remove unused code.
|
2022-05-17 11:18:05 +08:00 |
|
|
孙广明
|
46e4eae295
|
* Finish task #54205.
|
2022-05-17 11:15:33 +08:00 |
|
|
孙华伟
|
9fad4e929b
|
*Fix bug #22559.
|
2022-05-17 11:06:49 +08:00 |
|
|
王怡栋
|
670520548f
|
Merge branch 'sprint/wangyuting_fixbug_22520' into 'master'
* Fix bug #22520
See merge request easycorp/zentaopms!3435
|
2022-05-17 03:03:53 +00:00 |
|
|
孙广明
|
f19a716ba0
|
Merge branch 'sunhuawei_fixbug_22375' into 'master'
*Fix bug #22375
See merge request easycorp/zentaopms!3438
|
2022-05-17 02:44:29 +00:00 |
|
|
孙广明
|
0d46d0144b
|
Merge branch 'sunhuawei_task54210' into 'master'
*Fix bug #22338.
See merge request easycorp/zentaopms!3434
|
2022-05-17 02:42:28 +00:00 |
|
|
孙华伟
|
4bc08301f8
|
*Fix bug #22375
|
2022-05-17 10:40:11 +08:00 |
|
|
李玉春
|
743ba6a6da
|
Merge branch 'sprint/191_tianshujie_54353' into 'master'
Sprint/191 tianshujie 54353
See merge request easycorp/zentaopms!3437
|
2022-05-17 02:38:25 +00:00 |
|
|
tianshujie
|
2ee1ea4b7a
|
* Modifying judgment logic.
|
2022-05-17 10:36:41 +08:00 |
|
|
李玉春
|
bf512c437b
|
Merge branch 'sprint/191_liumengyi_54336' into 'master'
* Finish task #54346,#54345.
See merge request easycorp/zentaopms!3436
|
2022-05-17 02:25:55 +00:00 |
|
|
liumengyi
|
566b87823f
|
* Finish task #54346,#54345.
|
2022-05-17 10:07:26 +08:00 |
|
|
tianshujie
|
d65a6ee4eb
|
* Modify testcase of productplan model.
|
2022-05-17 09:58:49 +08:00 |
|
|
wangyuting2
|
faf8ee28b9
|
* Fix bug #22520
|
2022-05-17 09:58:28 +08:00 |
|
|
tianshujie
|
e848ea7d3f
|
* Fix the project logic to which the lookup execution belongs.
|
2022-05-17 09:39:07 +08:00 |
|
|
孙广明
|
c4e649ef25
|
* Finish task #54186.
|
2022-05-17 09:35:32 +08:00 |
|
|
孙华伟
|
475c0d6acc
|
*Fix bug #22338.
|
2022-05-17 09:32:25 +08:00 |
|
|
tianshujie
|
4bd3e1ba3e
|
* Finish task #54353.
|
2022-05-17 09:21:23 +08:00 |
|
|
王怡栋
|
a8afd69c54
|
Merge branch 'sgm_sprint190' into 'master'
* Code for task #54189.
See merge request easycorp/zentaopms!3433
|
2022-05-17 01:19:16 +00:00 |
|
|
孙广明
|
270715e54b
|
Merge branch 'sprint_sunjun_631' into 'master'
Sprint sunjun 631
See merge request easycorp/zentaopms!3410
|
2022-05-17 01:15:01 +00:00 |
|
|
孙广明
|
397930ac4e
|
* Code for task #54189.
|
2022-05-17 08:56:07 +08:00 |
|
|
sunjun
|
7e9466abbd
|
sprint_sunjun_631
|
2022-05-16 21:08:04 +08:00 |
|
|
王怡栋
|
f565477c52
|
Merge branch 'master_xieqiyu_22496' into 'master'
* Fix bug#22496.
See merge request easycorp/zentaopms!3429
|
2022-05-16 09:27:22 +00:00 |
|
|
王怡栋
|
3cd2d727a7
|
Merge branch 'sprint/master_zhouxudong_22531' into 'master'
* Fix bug #22531.
See merge request easycorp/zentaopms!3431
|
2022-05-16 09:26:34 +00:00 |
|
|
zhouxudong
|
48c052efad
|
* Fix bug #22531.
|
2022-05-16 09:23:29 +00:00 |
|
|
孙广明
|
57e139b2a4
|
Merge branch 'sprint/scx_testcase' into 'master'
Sprint/scx testcase
See merge request easycorp/zentaopms!3295
|
2022-05-16 09:04:32 +00:00 |
|
|
宋辰轩
|
19565d5455
|
* Add comment.
|
2022-05-16 17:02:26 +08:00 |
|
|
xieqiyu
|
c01b9f54cf
|
* Fix bug#22496.
|
2022-05-16 16:40:25 +08:00 |
|
|
xieqiyu
|
5ee54fb81a
|
* Fix bug#22496.
|
2022-05-16 16:30:24 +08:00 |
|
|
孙广明
|
91d1be1fa2
|
Merge branch 'sunhuawei_task_54207' into 'master'
*Finish task #54207.
See merge request easycorp/zentaopms!3428
|
2022-05-16 08:27:51 +00:00 |
|
|
孙华伟
|
3ae610d77d
|
Update model.php
|
2022-05-16 08:27:21 +00:00 |
|
|
孙华伟
|
94af8b93af
|
*Optimize the code.
|
2022-05-16 16:26:19 +08:00 |
|
|
孙华伟
|
ecea8c6147
|
Update model.php
|
2022-05-16 08:24:40 +00:00 |
|
|
孙华伟
|
4c968d5872
|
*Optimize the code.
|
2022-05-16 16:21:34 +08:00 |
|
|
孙华伟
|
39c0ad9c17
|
*Finish task #54207.
|
2022-05-16 16:08:30 +08:00 |
|
|
王怡栋
|
568d74299e
|
Merge branch 'master_xieqiyu_22375' into 'master'
* Fix bug#22375.
See merge request easycorp/zentaopms!3426
|
2022-05-16 07:13:36 +00:00 |
|
|
王怡栋
|
0374e98fdb
|
Merge branch '189_tanghucheng_fixbug' into 'master'
* Fix bug for sql.
See merge request easycorp/zentaopms!3425
|
2022-05-16 07:13:07 +00:00 |
|
|
王怡栋
|
1ecf960064
|
Merge branch 'fixbug' into 'master'
* Fix bug.
See merge request easycorp/zentaopms!3424
|
2022-05-16 07:01:15 +00:00 |
|
|
xieqiyu
|
e085535743
|
* Fix bug#22375.
|
2022-05-16 14:59:06 +08:00 |
|
|
tanghucheng
|
d0a5b69f6e
|
* Fix bug for sql.
|
2022-05-16 06:57:50 +00:00 |
|
|
tanghucheng
|
ad9305f120
|
* Fix bug.
|
2022-05-16 06:53:14 +00:00 |
|
|
王怡栋
|
57cf623f54
|
Merge branch 'fixbug' into 'master'
* Fix bug.
See merge request easycorp/zentaopms!3423
|
2022-05-16 06:45:50 +00:00 |
|
|
tanghucheng
|
a0bd326f3b
|
* Fix bug.
|
2022-05-16 06:43:34 +00:00 |
|
|
孙广明
|
175c38ef9d
|
Merge branch 'bug_22471' into 'master'
* Fix bug#22471
See merge request easycorp/zentaopms!3413
|
2022-05-16 06:14:40 +00:00 |
|
|
李玉春
|
8d8a321ed6
|
Merge branch 'sprint/tianshujie_fixbug' into 'master'
* Fix bug #22490.
See merge request easycorp/zentaopms!3422
|
2022-05-16 06:14:07 +00:00 |
|
|
王怡栋
|
77308c7fc1
|
Merge branch 'sprint/189_hufangzhou_sso' into 'master'
* Fix an error of sso.
See merge request easycorp/zentaopms!3419
|
2022-05-16 05:57:59 +00:00 |
|
|
王怡栋
|
0d87358352
|
Merge branch 'sprint/189_hufangzhou_22250' into 'master'
* Fix bug #22250.
See merge request easycorp/zentaopms!3420
|
2022-05-16 05:57:41 +00:00 |
|