Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity
32,259 Commits 2 Branches 292 Tags
18a744763fc1824012bea89e829830ad12926587
Commit Graph
32259 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
zhengrunyu 18a744763f *Fixbug 18172. 2022-01-04 16:47:33 +08:00
zhengrunyu 41eeabc074 *Fix bug 18168. 2022-01-04 15:32:54 +08:00
zhengrunyu f06de76227 *Fix bug 18165. 2022-01-04 14:50:44 +08:00
孙广明 b1d0c553a1 Merge branch 'zhengry_codeedit' into 'master' 
*Code edit.

See merge request easycorp/zentaopms!1247
 2022-01-04 04:19:32 +00:00
zhengrunyu 0d05a3aa8c *Code edit. 2022-01-04 12:00:42 +08:00
王怡栋 36a1c6f8a9 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-01-04 11:29:53 +08:00
王怡栋 7001079844 * adjust for block priv. 2022-01-04 11:28:43 +08:00
李玉春 7739f455a0 Merge branch 'sgm_changevar' into 'master' 
* Merge code.

See merge request easycorp/zentaopms!1246
 2022-01-04 03:26:17 +00:00
孙广明 e370a094a9 * Merge code. 2022-01-04 11:08:30 +08:00
孙广明 a92e8b5435 Merge branch 'sprint/181_zhengrunyu_Fixbug' into 'master' 
*Code batchedit.*Code batchedit.*Code batchedit.*Code batchedit.*Code...

See merge request easycorp/zentaopms!1244
 2022-01-04 03:04:16 +00:00
zhujinyong 87817d186c * Fix router error of api. 2022-01-04 10:52:29 +08:00
zhujinyong 17384dcb06 * Fix bug: super model must return. 2022-01-04 10:27:09 +08:00
zhengrunyu 7e037ff68d *Code batchedit.*Code batchedit.*Code batchedit.*Code batchedit.*Code batchedit.*Code batchedit.*Code batchedit.*Code batchedit. 2022-01-04 10:27:06 +08:00
李玉春 c5bd97f292 Merge branch 'sgm_46671' into 'master' 
* Fix productplan bug.

See merge request easycorp/zentaopms!1243
 2022-01-04 02:21:19 +00:00
孙广明 feb80b05d5 * Fix productplan bug. 2022-01-04 10:18:48 +08:00
李玉春 1f72bd497a Merge branch 'sgm_46671' into 'master' 
* Code for task 46671.

See merge request easycorp/zentaopms!1239
 2022-01-04 02:05:58 +00:00
孙广明 9a76f5048e Merge branch 'sprint/181_zhengrunyu_Fixbug' into 'master' 
*Code edit.

See merge request easycorp/zentaopms!1241
 2022-01-04 02:05:18 +00:00
zhengrunyu 96c9cd54d2 *Code edit. 2022-01-04 09:56:35 +08:00
孙广明 5a7cd21296 Merge branch 'sprint/181_tianshujie_18143' into 'master' 
* Fix bug #18143.

See merge request easycorp/zentaopms!1240
 2022-01-04 01:56:19 +00:00
tianshujie 6ae2c2aaab * Fix bug #18143. 2022-01-04 09:54:07 +08:00
孙广明 ba570f1467 * Code for task 46671. 2022-01-04 09:27:44 +08:00
孙广明 393371607e Merge branch 'sprint/181_tianshujie_optimize' into 'master' 
* Modify the batch editing plan logic.

See merge request easycorp/zentaopms!1237
 2022-01-04 01:01:52 +00:00
tianshujie 58a4ebb665 * Modify the code format of productplan mode file. 2022-01-04 09:00:21 +08:00
tianshujie 3c174fbb7f * Optimize the code for judging whether the time is correct. 2022-01-03 13:30:22 +08:00
tianshujie ece63ad3c0 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/181_tianshujie_optimize 2022-01-03 13:21:24 +08:00
Hao Sun a9cc771d85 Revert "Revert "Merge branch 'devops18_caoyanyi' into 'master'"" 
This reverts commit 3a0ec82016.
 2021-12-31 17:35:39 +08:00
Hao Sun 3a0ec82016 Revert "Merge branch 'devops18_caoyanyi' into 'master'" 
This reverts commit 41004048b2, reversing
changes made to 86fb6e2680.
 2021-12-31 17:22:32 +08:00
Hao Sun 3bf672f1f3 * Fix chat button not show in biz edition caused by ZentaoPHP ext rule: one control method Ican only be extended once time. 2021-12-31 17:20:59 +08:00
tianshujie 0ec08bca7d * Adjust the code. 2021-12-31 15:58:00 +08:00
李玉春 41004048b2 Merge branch 'devops18_caoyanyi' into 'master' 
* Modify test case for apiCreateBranchPriv.

See merge request easycorp/zentaopms!1236
 2021-12-31 07:54:26 +00:00
tianshujie 39a8417b61 * Modify the batch editing plan logic. 2021-12-31 15:49:44 +08:00
caoyanyi 401d793532 * Modify test case for apiCreateBranchPriv. 2021-12-31 07:33:58 +00:00
李玉春 86fb6e2680 Merge branch 'devops18_zenggang' into 'master' 
Devops18 zenggang

See merge request easycorp/zentaopms!1233
 2021-12-31 07:24:24 +00:00
李玉春 f798d94311 Merge branch 'sgm_codedetail' into 'master' 
* Fix code details.

See merge request easycorp/zentaopms!1235
 2021-12-31 07:10:34 +00:00
孙广明 fe6a6c0c54 * Fix code details. 2021-12-31 15:09:47 +08:00
李玉春 20bcf6fae5 Merge branch 'sgm_refactor' into 'master' 
* Fix code details.

See merge request easycorp/zentaopms!1231
 2021-12-31 07:06:17 +00:00
孙广明 1d4e589a26 * Fix code style. 2021-12-31 15:05:10 +08:00
孙广明 7a2a9daaef * Fix code details. 2021-12-31 15:04:19 +08:00
zenggang fde89aa9d5 * Adjust code 2021-12-31 06:19:15 +00:00
zenggang 031c8e03a9 * Add unit test 2021-12-31 05:56:16 +00:00
孙广明 68de877d11 Merge branch 'sprint/181_tianshujie_optimize' into 'master' 
* Optimize batch editing plan code.

See merge request easycorp/zentaopms!1232
 2021-12-31 05:44:16 +00:00
tianshujie 1f1e56c28f * Optimize batch editing plan code. 2021-12-31 13:41:01 +08:00
孙广明 c4140ad766 * Fix code details. 2021-12-31 13:18:32 +08:00
孙广明 56717fe06e Merge branch 'sprint/181_liumengyi_fixbug' into 'master' 
* Modify judgment.

See merge request easycorp/zentaopms!1230
 2021-12-31 05:03:28 +00:00
孙广明 94ddbd4852 Merge branch 'sprint/181_tianshujie_optimize' into 'master' 
* Modify the problem of dragging the card.

See merge request easycorp/zentaopms!1227
 2021-12-31 05:02:09 +00:00
liumengyi b7af7a3754 * Modify judgment. 2021-12-31 13:00:10 +08:00
李玉春 2bb6bb8825 Merge branch 'refactor' into 'master' 
Refactor

See merge request easycorp/zentaopms!1229
 2021-12-31 04:25:42 +00:00
李玉春 b0d7ba1708 Merge branch 'sgm_46671' into 'master' 
* Finish task #46671.

See merge request easycorp/zentaopms!1222
 2021-12-31 04:19:26 +00:00
tianshujie c6794b36f2 * Fix the problem of the activation operation of the card in progress. 2021-12-31 11:22:40 +08:00
孙广明 c871137c66 * Fix code style. 2021-12-31 11:17:42 +08:00