 lanzongjun
|
ea0d3d44ba
|
Merge branch 'zentaopms_256' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_256
|
2022-12-05 09:23:07 +08:00 |
|
|
lanzongjun
|
9fc3e25635
|
* fix execution plans
|
2022-12-05 09:23:01 +08:00 |
|
|
Yagami
|
3c088eb548
|
Merge branch 'zentaopms_256' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_256
|
2022-12-02 15:59:02 +08:00 |
|
|
Yagami
|
d7d897a8f7
|
* Fix code error.
|
2022-12-02 15:58:52 +08:00 |
|
|
lanzongjun
|
a0c214eace
|
* fix bug #30475
|
2022-12-02 15:54:05 +08:00 |
|
|
lanzongjun
|
3b09109e21
|
* fix bug #30496
|
2022-12-02 15:34:11 +08:00 |
|
|
lanzongjun
|
a4563c065a
|
Merge branch 'zentaopms_256' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_256
|
2022-12-02 15:32:42 +08:00 |
|
|
lanzongjun
|
a1bd34b3ce
|
* fix bug #30496
|
2022-12-02 15:32:36 +08:00 |
|
|
Yagami
|
b181c11e37
|
* Fix bug #30476.
|
2022-12-02 15:00:12 +08:00 |
|
|
lanzongjun
|
546a417339
|
Merge branch 'zentaopms_256' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_256
|
2022-12-02 14:41:56 +08:00 |
|
|
lanzongjun
|
8a81c215b5
|
* fix bug #30472
|
2022-12-02 14:41:49 +08:00 |
|
|
孙广明
|
0019435f65
|
Merge branch 'sprint/zentaopms268_mayue_bug#30457' into 'zentaopms_256'
* Fix bug #30457.
See merge request easycorp/zentaopms!6450
|
2022-12-02 06:35:44 +00:00 |
|
|
Yagami
|
dda0446e57
|
* Fix bug #30436.
|
2022-12-02 14:34:34 +08:00 |
|
|
lanzongjun
|
5498b85ad6
|
Merge branch 'zentaopms_256' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_256
|
2022-12-02 13:57:43 +08:00 |
|
|
lanzongjun
|
19db2248d9
|
* fix bug #30480
|
2022-12-02 13:57:34 +08:00 |
|
|
Yagami
|
45169a4822
|
Merge branch 'zentaopms_256' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_256
|
2022-12-02 13:42:33 +08:00 |
|
|
Yagami
|
dbc00993c6
|
* Fix execution manage products bug.
|
2022-12-02 13:42:09 +08:00 |
|
|
lanzongjun
|
aa96dfc3a9
|
* fix bug #30447
|
2022-12-02 13:28:08 +08:00 |
|
|
lanzongjun
|
0247499985
|
Merge branch 'zentaopms_256' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_256
|
2022-12-02 10:59:47 +08:00 |
|
|
lanzongjun
|
0a5e89dd34
|
* fix bug #30482
|
2022-12-02 10:59:34 +08:00 |
|
|
Yagami
|
8cb3e136d3
|
Merge branch 'zentaopms_256' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_256
|
2022-12-02 10:48:11 +08:00 |
|
|
Yagami
|
32424d7072
|
* Finish task #77800.
|
2022-12-02 10:39:49 +08:00 |
|
|
lanzongjun
|
a835220fe1
|
resolve conflict master
|
2022-12-02 10:28:31 +08:00 |
|
|
孙广明
|
8b7afb1bef
|
Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'
change copyproject to copyProject
See merge request easycorp/zentaopms!6449
|
2022-12-02 01:59:22 +00:00 |
|
|
mayue
|
7d92df405a
|
* Fix bug #30457.
|
2022-12-02 09:53:44 +08:00 |
|
|
lanzongjun
|
59c7949f9a
|
change copyproject to copyProject
|
2022-12-02 09:53:03 +08:00 |
|
|
孙广明
|
57ea3dc290
|
Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'
fix cp project js error
See merge request easycorp/zentaopms!6447
|
2022-12-02 00:59:43 +00:00 |
|
|
lanzongjun
|
8e1172e955
|
fix cp project js error
|
2022-12-02 08:50:07 +08:00 |
|
|
Yagami
|
02171e9a5d
|
* Finish task #77800.
|
2022-12-02 08:34:49 +08:00 |
|
|
Yagami
|
15f2a78270
|
Merge branch 'sprint/zentaopms268_mayue_bug#30422' into zentaopms_256
|
2022-12-02 08:29:55 +08:00 |
|
|
王怡栋
|
8047908575
|
Merge branch 'zentaopms266_wyd' into 'master'
* fix bug #30274.
See merge request easycorp/zentaopms!6445
|
2022-12-01 09:00:59 +00:00 |
|
|
wangyidong
|
8007950ef9
|
* fix bug #30274.
|
2022-12-01 16:59:45 +08:00 |
|
|
王怡栋
|
9c5c781b52
|
Merge branch 'zentaopms_266_task_#77616' into 'master'
* Fix bug for task #77615,#77616.
See merge request easycorp/zentaopms!6444
|
2022-12-01 08:39:27 +00:00 |
|
|
daitingting
|
995f927ae6
|
* Fix bug for task #77615,#77616.
|
2022-12-01 08:36:46 +00:00 |
|
|
兰宗俊
|
94157d4c10
|
Merge branch 'sprint/zentaopms256_lanzongjun' into 'zentaopms_256'
fix change product text missing
See merge request easycorp/zentaopms!6443
|
2022-12-01 08:15:53 +00:00 |
|
|
lanzongjun
|
542cd36946
|
fix change product text missing
|
2022-12-01 16:14:56 +08:00 |
|
|
王怡栋
|
5aa2fda450
|
Merge branch 'zentaopms_266_bug#30429' into 'master'
* Fix bug #30429.
See merge request easycorp/zentaopms!6436
|
2022-12-01 07:58:03 +00:00 |
|
|
王怡栋
|
dc827982fe
|
Merge branch 'master_bug_23961' into 'master'
* Fix bug #23961.
See merge request easycorp/zentaopms!6432
|
2022-12-01 07:57:10 +00:00 |
|
|
王怡栋
|
00312f6d4f
|
Merge branch 'sprint/feedback1358' into 'master'
Sprint/feedback1358
See merge request easycorp/zentaopms!6431
|
2022-12-01 07:56:07 +00:00 |
|
|
王怡栋
|
7013e19604
|
Merge branch 'sprint/feedback1403' into 'master'
Sprint/feedback1403
See merge request easycorp/zentaopms!6428
|
2022-12-01 07:54:50 +00:00 |
|
|
孙广明
|
71f18cd3b3
|
Merge branch 'sprint/zentaopms256_lanzongjun' into 'zentaopms_256'
fix cp project js error
See merge request easycorp/zentaopms!6442
|
2022-12-01 07:42:25 +00:00 |
|
|
lanzongjun
|
a13ae45bd1
|
fix cp project js error
|
2022-12-01 15:36:17 +08:00 |
|
|
Yagami
|
0d028378b4
|
Merge branch 'zentaopms_256' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_256
|
2022-12-01 15:15:22 +08:00 |
|
|
Yagami
|
cfc70e8176
|
* Code for task #77800.
|
2022-12-01 15:15:07 +08:00 |
|
|
朱金勇
|
fe071c9de7
|
Merge branch 'check_ext-gd' into 'master'
* Add check ext-gd extension.
See merge request easycorp/zentaopms!6430
|
2022-12-01 07:05:16 +00:00 |
|
|
孙广明
|
287800ee73
|
Merge branch 'zentaopms_256' into 'sprint/zentaopms268_mayue_bug#30422'
# Conflicts:
# module/productplan/control.php
|
2022-12-01 06:47:48 +00:00 |
|
|
mayue
|
c866a1ab41
|
* Fix bug #30422.
|
2022-12-01 14:46:04 +08:00 |
|
|
孙广明
|
a315f7205f
|
Merge branch 'sprint/fixbug_liumengyi_30278' into 'master'
* Fix bug #30278.
See merge request easycorp/zentaopms!6439
|
2022-12-01 06:44:33 +00:00 |
|
|
孙广明
|
b191213fce
|
Merge branch 'lyk_feedback_1461' into 'master'
* Resolve feedback #1461.
See merge request easycorp/zentaopms!6440
|
2022-12-01 06:36:01 +00:00 |
|
|
孙广明
|
1caccc3696
|
Merge branch 'sprint/zentaopms268_mayue_bug#30373' into 'zentaopms_256'
* Fix bug #30373.
See merge request easycorp/zentaopms!6438
|
2022-12-01 06:31:11 +00:00 |
|