Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity
41,513 Commits 2 Branches 292 Tags
85f7dd9c951f589d52a3228ed3ced8a51c8cbbd8
Commit Graph
41513 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
zhouxudong 85f7dd9c95 * Finish task #59525. 2022-07-06 01:29:25 +00:00
zhouxudong ddecdf5cb8 * Finish task #59525. 2022-07-06 00:31:05 +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
王怡栋 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
王怡栋 0c8c179094 Merge branch 'master_xieqiyu_kanban' into 'master' 
Master xieqiyu kanban

See merge request easycorp/zentaopms!4344
 2022-07-05 07:13:24 +00:00
王怡栋 e7e50fde0b Merge branch 'sprint/master_zhouxudong_24751' into 'master' 
* Fix bug #24751.

See merge request easycorp/zentaopms!4347
 2022-07-05 07:12:20 +00:00
王怡栋 ae7cc6764d Merge branch 'sgm_kanban' into 'master' 
* Finish task #59701.

See merge request easycorp/zentaopms!4348
 2022-07-05 07:08:41 +00:00
孙广明 837c796c32 * Fix code details. 2022-07-05 15:07:31 +08:00
孙广明 25028997fa * Finish task #59701. 2022-07-05 15:03:15 +08:00
刘刚 7450daec93 Merge branch 'sprint/zentaobiz10' into 'master' 
* Finish task #59641.

See merge request easycorp/zentaopms!4343
 2022-07-05 07:02:00 +00:00
zhouxudong b9ee65ddfd * Fix bug #24751. 2022-07-05 06:54:04 +00:00
xieqiyu 2148419cb2 * Code for task#59543. 2022-07-05 14:43:37 +08:00
王怡栋 0833fddf40 Merge branch 'sprint212_leiyong_task_59539' into 'master' 
Sprint212 leiyong task 59539

See merge request easycorp/zentaopms!4337
 2022-07-05 06:41:07 +00:00
liuruogu 667b4fcd1a * Finish task #59641. 2022-07-05 06:39:10 +00:00
leiyong 5f0fdefe27 * Add comment. 2022-07-05 06:36:00 +00:00
guofeilong 45ba655887 * Finish task #59703 2022-07-05 06:28:11 +00:00
孙广明 a7919cd8f1 Merge branch 'sprint/213_mayue_bug23611' into 'master' 
* Fix bug #23611.

See merge request easycorp/zentaopms!4340
 2022-07-05 06:06:49 +00:00
mayue 924702eea3 * Fix bug #23611. 2022-07-05 14:01:57 +08:00
xieqiyu 74b3fb5eeb * Code for task#59544. Update lane color and set column and WIP. 2022-07-05 13:59:03 +08:00
李玉春 c1f66467cd Merge branch 'cyy_59436' into 'master' 
Finish task 59436

See merge request easycorp/zentaopms!4335
 2022-07-05 05:52:18 +00:00
zhouxudong 60ddcc7894 * Finish task #59518 #59522. 2022-07-05 05:49:04 +00:00
李玉春 1a84516991 Merge branch 'sprint/wangzemei/task59519' into 'master' 
* Finish task #59519

See merge request easycorp/zentaopms!4338
 2022-07-05 05:43:28 +00:00
liuruogu 31b7377446 * Finish task #59641. 2022-07-05 05:41:16 +00:00
wangzemei e30bd32527 * Finish task #59519 2022-07-05 05:40:53 +00:00
王怡栋 ed7276c166 Merge branch 'sprint/211_tianshujie_59472' into 'master' 
* Finish task #59472.

See merge request easycorp/zentaopms!4336
 2022-07-05 05:20:55 +00:00
tianshujie e29794271a * Delete extra blank lines. 2022-07-05 13:19:56 +08:00
tianshujie 4e05cb1916 * Finish task #59472. 2022-07-05 13:19:03 +08:00
leiyong 14a6406775 * Finish task#59532. 2022-07-05 05:06:27 +00:00
caoyanyi b2085d27c6 * Modify language. 2022-07-05 13:03:26 +08:00
caoyanyi 5fe4e3f9be * Add unique check. 2022-07-05 12:10:52 +08:00
leiyong a9695b60f3 * Finish task#59531. 2022-07-05 02:56:18 +00:00
王怡栋 7a01041c35 Merge branch 'master_xieqiyu_kanban' into 'master' 
* Code for task#59545,#59546. Update lane name.

See merge request easycorp/zentaopms!4334
 2022-07-05 02:45:38 +00:00
王怡栋 e28ac4526d Merge branch 'sprint/zentaobiz10' into 'master' 
* Finish task #59641.

See merge request easycorp/zentaopms!4328
 2022-07-05 02:45:04 +00:00
王怡栋 646d720201 Merge branch 'sprint/zui_guofeilong_min.css' into 'master' 
* rollback pointer-events none out table

See merge request easycorp/zentaopms!4333
 2022-07-05 02:43:41 +00:00
xieqiyu 704711ce6f * Code for task#59545,#59546. Update lane name. 2022-07-05 10:32:39 +08:00
孙广明 0555f59112 Merge branch 'zg_bug_24689' into 'master' 
* Fix bug #24689

See merge request easycorp/zentaopms!4323
 2022-07-05 02:16:07 +00:00
孙广明 bae83de408 Merge branch 'sprint/213_mayue_task#59700' into 'master' 
* Optimize code for task#59700.

See merge request easycorp/zentaopms!4332
 2022-07-05 02:15:50 +00:00
mayue 637f81c00e * Optimize code for task#59700. 2022-07-05 10:13:53 +08:00
王怡栋 38bd35f650 Merge branch 'sprint/212_hufangzhou_59538' into 'master' 
* Finish task #59538.

See merge request easycorp/zentaopms!4330
 2022-07-05 02:10:23 +00:00
王怡栋 bbf8176034 Merge branch 'master_xieqiyu_kanban' into 'master' 
* Code for task#59544,#59546. Add update region when delete lane.

See merge request easycorp/zentaopms!4329
 2022-07-05 02:10:12 +00:00
王怡栋 71ab49c34e Merge branch 'sprint/master_zhouxudong_59529' into 'master' 
* Finish task #59534 #59530 #59529.

See merge request easycorp/zentaopms!4325
 2022-07-05 02:09:08 +00:00
王怡栋 28bea206d8 Merge branch 'fixbug' into 'master' 
* Fix bug #24708.

See merge request easycorp/zentaopms!4322
 2022-07-05 02:08:30 +00:00
王怡栋 a6916a73c5 Merge branch 'sprint/master_zhouxudong_59527' into 'master' 
Sprint/master zhouxudong 59527

See merge request easycorp/zentaopms!4326
 2022-07-05 02:07:26 +00:00
liuruogu e82585d3d7 * Finish task #59641. 2022-07-05 02:06:59 +00:00
hufangzhou 52bbc84bb4 * Finish task #59538. 2022-07-05 10:06:06 +08:00
guofeilong 3593dc29fe * rollback pointer-events none out table 2022-07-05 02:03:39 +00:00
王怡栋 db007fe5eb Merge branch 'sprint/211_tianshujie_59472' into 'master' 
Sprint/211 tianshujie 59472

See merge request easycorp/zentaopms!4327
 2022-07-05 01:54:17 +00:00
tianshujie 87160bf3a5 * Fix bug #24718. 2022-07-05 09:53:43 +08:00
tianshujie 63834e128c * Fix bug #24718. 2022-07-05 09:52:13 +08:00