Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity
30,375 Commits 2 Branches 292 Tags
2fc75a1dd4db87f3fae92feb163c3f60604bf82f
Commit Graph
30375 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
李玉春 2fc75a1dd4 Merge branch 'sprint/174_songchenxuan_45039' into 'master' 
* Finish task #45039.

See merge request easycorp/zentaopms!704
 2021-12-01 06:24:25 +00:00
李玉春 d258b05fd4 Merge branch 'sprint/174_songchenxuan_16798' into 'master' 
* Fix bug #16798.

See merge request easycorp/zentaopms!708
 2021-12-01 06:23:41 +00:00
李玉春 85a6828a2e Merge branch 'sprint/174_tianshujie_16801' into 'master' 
* Fix bug #16801.

See merge request easycorp/zentaopms!703
 2021-12-01 06:23:17 +00:00
李玉春 3d8fc0dcfe Merge branch 'sprint/174_tianshujie_16977' into 'master' 
* Fix bug #16977.

See merge request easycorp/zentaopms!706
 2021-12-01 06:21:29 +00:00
李玉春 876af8d939 Merge branch 'sprint/174_tianshujie_16973' into 'master' 
* Fix bug #16973.

See merge request easycorp/zentaopms!707
 2021-12-01 06:18:36 +00:00
李玉春 16f81f5b8a Merge branch 'sprint/174_tianshujie_16781' into 'master' 
* Fix bug #16781.

See merge request easycorp/zentaopms!702
 2021-12-01 06:17:55 +00:00
songchenxuan 98b5a77754 * Fix bug #16798. 2021-12-01 14:16:24 +08:00
tianshujie e73b8d316c * Fix bug #16973. 2021-12-01 14:15:20 +08:00
tianshujie e74dd9ad80 * Fix bug #16977. 2021-12-01 14:05:59 +08:00
王怡栋 9286434da5 * code for task #45297. 2021-12-01 13:59:25 +08:00
songchenxuan 839ee66e77 * Finish task #45039. 2021-12-01 13:41:01 +08:00
tianshujie 2d251fb452 * Fix bug #16801. 2021-12-01 13:37:54 +08:00
tianshujie ac27fd80d8 * Fix bug #16781. 2021-12-01 13:30:10 +08:00
李玉春 4b37f6b83b Merge branch 'sprint/174_songchenxuan_45040' into 'master' 
* Finish task #45040.

See merge request easycorp/zentaopms!684
 2021-12-01 05:24:23 +00:00
李玉春 686d773f0b Merge branch 'sprint/174_mayue_44987,44988,44989' into 'master' 
* Finish task #44987,44988,44989.

See merge request easycorp/zentaopms!692
 2021-12-01 05:23:47 +00:00
李玉春 950c567912 Merge branch 'sprint/174_xieqiyu_45079' into 'master' 
Finish task #44992, task #44991, task #44990.

See merge request easycorp/zentaopms!687
 2021-12-01 05:23:04 +00:00
mayue c22503af7b * Finish task #44987,44988,44989. 2021-12-01 13:18:47 +08:00
李玉春 ee3a885a28 Merge branch 'sprint/174_tianshujie_16789' into 'master' 
Sprint/174 tianshujie 16789

See merge request easycorp/zentaopms!700
 2021-12-01 05:17:33 +00:00
songchenxuan 631a62e2dd * Finish task #45040. 2021-12-01 13:16:42 +08:00
孙广明 3803a94c4c Merge branch 'sprint/175_zhengrunyu_45150' into 'master' 
*Finish task #45150.

See merge request easycorp/zentaopms!698
 2021-12-01 05:16:22 +00:00
tianshujie 3accd38185 * Remove useless code. 2021-12-01 13:14:06 +08:00
李玉春 171796e08f Merge branch 'sprint/174_songchenxuan_16953' into 'master' 
* Fix bug #16953.

See merge request easycorp/zentaopms!694
 2021-12-01 05:13:53 +00:00
李玉春 eec7b10dd3 Merge branch 'sprint/174_mayue_16640' into 'master' 
* Fix bug #16640.

See merge request easycorp/zentaopms!695
 2021-12-01 05:13:38 +00:00
孙广明 02199a9296 Merge branch 'sprint/master_tanghucheng_for_max' into 'master' 
* Finish task #45101.

See merge request easycorp/zentaopms!699
 2021-12-01 05:13:24 +00:00
tianshujie 7498352698 * Fix bug #16789. 2021-12-01 13:13:21 +08:00
zhengrunyu ae3c0eb522 *Finish task #45150. 2021-12-01 13:04:31 +08:00
tanghucheng ff0b8d0c9c * Finish task #45101. 2021-12-01 13:01:54 +08:00
李玉春 3c56b60dd7 Merge branch 'sprint/174_mayue_16631' into 'master' 
* Fix bug #16631.

See merge request easycorp/zentaopms!670
 2021-12-01 05:01:25 +00:00
李玉春 20ae1dba85 Merge branch 'sprint/175_liumengyi_16882' into 'master' 
* Fix bug #16882.

See merge request easycorp/zentaopms!690
 2021-12-01 05:01:11 +00:00
李玉春 c470e13c6e Merge branch 'sprint/174_tianshujie_16968' into 'master' 
* Fix bug #16968.

See merge request easycorp/zentaopms!691
 2021-12-01 03:39:17 +00:00
李玉春 55166d5409 Merge branch 'sprint/174_tianshujie_45029' into 'master' 
* Fix bug #45029.

See merge request easycorp/zentaopms!685
 2021-12-01 03:35:46 +00:00
zhujinyong c1750bffca Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-12-01 11:32:38 +08:00
zhujinyong 8ee3e5ce16 Merge branch 'sprint/168_sunhao/task45145' 2021-12-01 11:32:08 +08:00
李玉春 64c603d9d5 Merge branch 'sprint/174_tianshujie_task' into 'master' 
* Restore code.

See merge request easycorp/zentaopms!680
 2021-12-01 03:31:45 +00:00
xieqiyu a0efc7aab9 * Fix bug. 2021-12-01 11:30:22 +08:00
liumengyi bba0c40dfe * Fix bug #16882, #16924. 2021-12-01 11:25:02 +08:00
李玉春 ccc6de5463 Merge branch 'sprint/174_mayue_16682' into 'master' 
* Fix bug #16682.

See merge request easycorp/zentaopms!697
 2021-12-01 03:21:02 +00:00
mayue 9a7bd2a6fc * Fix bug #16682. 2021-12-01 11:19:28 +08:00
songchenxuan 85cf0ab20c * Finish task #45040. 2021-12-01 11:15:19 +08:00
王怡栋 5b00079375 * adjust for get view with tab. 2021-12-01 11:14:29 +08:00
songchenxuan 1261ac3edb * Fix bug #16953. 2021-12-01 11:11:11 +08:00
孙广明 a4d94e6123 Merge branch 'sprint/master_tanghucheng_for_max' into 'master' 
* Fix waterfall menu.

See merge request easycorp/zentaopms!696
 2021-12-01 03:11:11 +00:00
tanghucheng 0224791b5a * Fix waterfall menu. 2021-12-01 11:08:13 +08:00
mayue 56d3fa6256 * Fix bug #16640. 2021-12-01 11:02:52 +08:00
songchenxuan 1bb80cb5b3 * Fix bug #16953. 2021-12-01 11:02:31 +08:00
孙广明 1a9a2cb624 Merge branch 'spirnt/175_liyuchun_bug' into 'master' 
* Finish task #45152.

See merge request easycorp/zentaopms!686
 2021-12-01 02:56:55 +00:00
朱金勇 ac94dadfd4 Merge branch 'sprint/174_xieqiyu_fixOptionMenu' into 'master' 
* Fix option menu in doc and caselib.

See merge request easycorp/zentaopms!693
 2021-12-01 02:51:38 +00:00
xieqiyu 85ef3a9849 * Fix option menu in doc and caselib. 2021-12-01 10:49:44 +08:00
mayue c62d599292 * Finish task #44987,44988,44989. 2021-12-01 10:44:38 +08:00
孙广明 d91e3346df Merge branch 'sprint/175_zhengrunyu_45150' into 'master' 
*Finish task #45150.

See merge request easycorp/zentaopms!688
 2021-12-01 02:43:19 +00:00