Commit Graph
34754 Commits
Author SHA1 Message Date
孙广明 ba6798198f Merge branch 'sprint216_zg_gaijin' into 'master'
* Remove productplan die

See merge request easycorp/zentaopms!4572
2022-07-15 03:15:09 +00:00
孙广明 aedab5c784 Merge branch 'sprint/216_mayue_bug#25358' into 'master'
* Fix bug #25358.

See merge request easycorp/zentaopms!4571
2022-07-15 03:14:57 +00:00
孙广明 bcf080f6b7 Merge branch 'liyuchun_fixbug' into 'master'
Liyuchun fixbug

See merge request easycorp/zentaopms!4570
2022-07-15 03:14:43 +00:00
李玉春 51b2242326 Liyuchun fixbug 2022-07-15 03:14:43 +00:00
孙广明 c468dd6c63 Merge branch 'zg_bugs' into 'master'
* Fix batchadd user ajax error

See merge request easycorp/zentaopms!4566
2022-07-15 03:13:52 +00:00
孙广明 c04d08210a * Code for php error. 2022-07-15 10:56:52 +08:00
zenggang 410bd4d3aa * Remove productplan die 2022-07-15 02:51:57 +00:00
mayue e31f207b0b * Fix bug #25358. 2022-07-15 10:45:23 +08:00
王怡栋 27b4774795 Merge branch 'sprint/215_liumengyi_25336' into 'master'
* Fix bug #25336 and fix bug #25325.

See merge request easycorp/zentaopms!4568
2022-07-15 02:37:13 +00:00
王怡栋 b022b8b7f5 Merge branch 'master_xieqiyu_25084' into 'master'
* Fix bug#25084.

See merge request easycorp/zentaopms!4567
2022-07-15 02:36:35 +00:00
王怡栋 f900da76ce Merge branch 'sprint214_fix_bug' into 'master'
* Processing product default value error.

See merge request easycorp/zentaopms!4569
2022-07-15 02:36:10 +00:00
孙广明 d5c7586a47 * Fix menu bug. 2022-07-15 10:33:58 +08:00
leiyong 76dc008820 * Processing product default value error. 2022-07-15 02:30:21 +00:00
liumengyi 5fe08a5c14 * Fix bug #25336. 2022-07-15 10:10:45 +08:00
wangyidong 1fcfdf2972 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-07-15 10:06:00 +08:00
wangyidong c4af3c24b6 * fix bug #25346. 2022-07-15 10:05:43 +08:00
liumengyi 94992c299f * Fix bug #25336. 2022-07-15 09:44:01 +08:00
xieqiyu f9e7b52cca * Fix bug#25084. 2022-07-15 09:28:00 +08:00
孙广明 52281f12c3 Merge branch 'liyuchun_fixbug' into 'master'
Liyuchun fixbug

See merge request easycorp/zentaopms!4562
2022-07-15 01:22:58 +00:00
孙广明 4617c3a040 Merge branch 'fixbug_25202' into 'master'
fixbug_25202

See merge request easycorp/zentaopms!4564
2022-07-15 01:22:47 +00:00
leiyong 949d7e2ce5 * Fix the product default value error. 2022-07-15 01:14:52 +00:00
sunjun d375ccf6a3 fixbug_25202 2022-07-15 01:12:58 +00:00
liyuchun 460e4cf336 * Fix bug #25266. 2022-07-15 01:06:24 +00:00
liyuchun 9b26371429 * Fix bug #25247. 2022-07-15 00:59:08 +00:00
zenggang f4d7a24cf3 * Fix batchadd user ajax error 2022-07-15 00:59:01 +00:00
Wenrui LI bcaaf11dfc * fix double header covering main in zentaoclient. 2022-07-15 08:52:25 +08:00
tianshujie f9e6fe5de4 * Fix bug #25329. 2022-07-14 17:14:54 +08:00
tianshujie 0c51ca4328 * Fix bug #25186. 2022-07-14 17:04:57 +08:00
朱金勇 76934f4dcd Merge branch 'sprint/master_zhaoke_60818' into 'master'
* Add test task name param to ciresults api.

See merge request easycorp/zentaopms!4554
2022-07-14 08:31:11 +00:00
tianshujie 01667100f0 * Fix bug #25309. 2022-07-14 16:26:30 +08:00
王怡栋 fc378df8b6 Merge branch 'master_xieqiyu_25027' into 'master'
* Fix bug#25027.

See merge request easycorp/zentaopms!4545
2022-07-14 08:24:13 +00:00
王怡栋 f7e343780c Merge branch 'master_xieqiyu_25312' into 'master'
* Fix bug#25312.

See merge request easycorp/zentaopms!4550
2022-07-14 08:23:54 +00:00
王怡栋 c1a012bb91 Merge branch 'sprint/hufangzhou_25281' into 'master'
* Fix bug #25281.

See merge request easycorp/zentaopms!4551
2022-07-14 08:23:43 +00:00
王怡栋 b34769598c Merge branch 'sprint/215_liumengyi_25289' into 'master'
* Fix bug #25289.

See merge request easycorp/zentaopms!4552
2022-07-14 08:23:30 +00:00
王怡栋 d282c902de Merge branch 'liugang_fixbug' into 'master'
* Fix bug of print kanban.

See merge request easycorp/zentaopms!4549
2022-07-14 08:22:53 +00:00
tianshujie dee593663b * Fix bug #25309. 2022-07-14 16:19:14 +08:00
liumengyi 139b6b4f40 * Fix bug #25289. 2022-07-14 16:04:03 +08:00
hufangzhou 8c62376d05 * Fix bug #25281. 2022-07-14 15:49:55 +08:00
xieqiyu 0c6aa2adb5 * Fix bug#25312. 2022-07-14 15:44:36 +08:00
liugang a53697f342 * Fix bug of print kanban. 2022-07-14 15:36:10 +08:00
xieqiyu efe88fea99 * Adjust comment. 2022-07-14 15:28:30 +08:00
孙广明 6b19ed146d Merge branch 'sprint/tianshujie_25268' into 'master'
Sprint/tianshujie 25268

See merge request easycorp/zentaopms!4547
2022-07-14 07:24:17 +00:00
tianshujie cad9145332 * Fix bug #25291. 2022-07-14 15:19:13 +08:00
tianshujie a4a71d2972 * Fix bug #25093. 2022-07-14 15:18:49 +08:00
王怡栋 f99fef0f94 Merge branch 'sprint/216_mayue_bug#24706' into 'master'
* Fix bug #24706.

See merge request easycorp/zentaopms!4546
2022-07-14 07:15:35 +00:00
mayue 6f9cfb66f1 * Fix bug #24706. 2022-07-14 15:13:51 +08:00
zhaoke 3d7685a12c * Add test task name param to ciresults api. 2022-07-14 07:04:05 +00:00
tianshujie 711c0e9e8c * Fix bug #25088. 2022-07-14 14:46:46 +08:00
王怡栋 d7c1fc83a5 Merge branch 'sprint/215_liumengyi_24795' into 'master'
* Fix bug #24795.

See merge request easycorp/zentaopms!4544
2022-07-14 05:57:51 +00:00
王怡栋 68c747655c Merge branch 'sprint/master_zhouxudong_25262' into 'master'
* Fix bug #25262.

See merge request easycorp/zentaopms!4543
2022-07-14 05:57:38 +00:00