Commit Graph
45686 Commits
Author SHA1 Message Date
tianshujie 80b66aea5c * Fix bug #28490. 2022-10-17 11:12:48 +08:00
tianshujie a16db808d2 * Fix bug #28488. 2022-10-17 10:56:26 +08:00
李玉春 ce56365e07 Merge branch 'sprint/wangzemei/fix28395' into 'master'
* Fix the problem that the button is not shown

See merge request easycorp/zentaopms!5753
2022-10-16 23:56:27 +00:00
李玉春 61e06ef72d Merge branch 'cyy_optimize' into 'master'
* Modify dividing line style.

See merge request easycorp/zentaopms!5750
2022-10-16 23:56:11 +00:00
wangzemei 478bbcc87c * Fix bug #28447 2022-10-14 17:21:37 +08:00
wangzemei 6aad1dacac * Fix the problem that the button is not shown 2022-10-14 14:57:17 +08:00
曹延义 1e6ad814be Merge branch 'master' into cyy_optimize 2022-10-14 13:25:38 +08:00
王怡栋 22a5c56590 Merge branch 'bug_28514' into 'master'
* Fix bug#28514

See merge request easycorp/zentaopms!5748
2022-10-14 04:18:07 +00:00
王怡栋 af516229bb Merge branch 'bug_28518' into 'master'
* Fix bug#28518

See merge request easycorp/zentaopms!5749
2022-10-14 04:17:35 +00:00
曹延义 1929b943c2 * Code for story #38730. 2022-10-14 09:58:09 +08:00
曹延义 8f99d8e1b3 * Modify dividing line style. 2022-10-14 08:44:14 +08:00
王怡栋 900f1f42dc Merge branch 'feedback_1077' into 'master'
* Code for feedback #1077

See merge request easycorp/zentaopms!5743
2022-10-14 00:41:43 +00:00
王怡栋 edf6de9fe9 Merge branch 'sprint/gfl_28499' into 'master'
* fix bug * 28499

See merge request easycorp/zentaopms!5741
2022-10-14 00:39:49 +00:00
王怡栋 72fb595f02 Merge branch 'story_37168' into 'master'
* Finish story#37168.

See merge request easycorp/zentaopms!5738
2022-10-14 00:17:47 +00:00
王怡栋 92b2e2c022 Merge branch 'sprint/feedback_1066' into 'master'
Sprint/feedback 1066

See merge request easycorp/zentaopms!5740
2022-10-14 00:16:16 +00:00
王怡栋 cf5b3319e5 Merge branch 'sprint/feedback_1128' into 'master'
* resolve feedback #1128

See merge request easycorp/zentaopms!5742
2022-10-14 00:08:17 +00:00
zenggang c7086c8d77 * Fix bug#28518 2022-10-13 07:50:54 +00:00
zenggang fa7624efbd * Fix bug#28514 2022-10-13 07:44:06 +00:00
朱金勇 2721b934bf Merge branch 'sprint/fix-92' into 'master'
* Fix GH-92: Uncaught TypeError: Unsupported operand types: array + null.

See merge request easycorp/zentaopms!5745
2022-10-13 04:13:42 +00:00
李玉春 beeba2ec80 Merge branch 'cyy_bug' into 'master'
* Modify product plan js error.

See merge request easycorp/zentaopms!5744
2022-10-13 03:09:56 +00:00
李玉春 81ca878b03 Merge branch 'sprint/244_tianshujie_70498' into 'master'
Sprint/244 tianshujie 70498

See merge request easycorp/zentaopms!5730
2022-10-13 03:09:37 +00:00
Lufei 261c3a0217 * Fix GH-92: Uncaught TypeError: Unsupported operand types: array + null. 2022-10-13 10:36:39 +08:00
曹延义 c6f8e04711 * Modify product plan js error. 2022-10-13 09:02:30 +08:00
李玉春 8624143bcc Merge branch 'cyy_app' into 'master'
* Add user info data return.

See merge request easycorp/zentaopms!5737
2022-10-13 00:58:13 +00:00
李玉春 3de060e49b Merge branch 'sprint/gfl_28333' into 'master'
Sprint/gfl 28333

See merge request easycorp/zentaopms!5732
2022-10-13 00:56:21 +00:00
李玉春 1b90b9c82c Merge branch 'sprint/247_wzm_important' into 'master'
* fix bug 28395  && change important theme color

See merge request easycorp/zentaopms!5731
2022-10-13 00:53:30 +00:00
zenggang fa83b54f4d * Code for feedback #1077 2022-10-12 08:56:08 +00:00
曹延义 4312630747 * Fix bug #28132. 2022-10-12 16:27:01 +08:00
guofeilong c46cf29a2c * fix bug * 28499 2022-10-12 07:52:09 +00:00
曹延义 4a1cb6551b * Fix bug #28
52.#
2022-10-12 15:45:02 +08:00
曹延义 95cb77cbd5 * Modify line width. 2022-10-12 15:39:54 +08:00
曹延义 a64f141e7b * Modify story page style. 2022-10-12 15:36:05 +08:00
chaideqing 7dd705342c * fix No bug-lang in open source version 2022-10-12 15:34:48 +08:00
chaideqing cf2d303acf * resolve feedback #1128 2022-10-12 14:41:26 +08:00
曹延义 704de9685b * Modify stage list data. 2022-10-12 13:16:40 +08:00
leiyong 97393330f9 * Finish story#37168. 2022-10-12 02:28:12 +00:00
曹延义 0faea8001e * Add user info data return. 2022-10-12 09:53:36 +08:00
李玉春 2f997c6537 Merge branch 'cyy_optimize' into 'master'
* Modify acl radio style.

See merge request easycorp/zentaopms!5727
2022-10-11 09:14:55 +00:00
曹延义 e29deea929 * Modify line width. 2022-10-11 17:03:40 +08:00
guofeilong 4bbf5fa371 * fix bug #28333 2022-10-11 08:54:36 +00:00
wangzemei da15610004 * rebuild green 2022-10-11 16:49:49 +08:00
曹延义 196af666e7 Merge branch 'master' into cyy_optimize 2022-10-11 16:47:49 +08:00
曹延义 e7391836f7 Merge branch 'master' into cyy_optimize 2022-10-11 16:44:23 +08:00
wangzemei 01a12c95d9 * fix bug #283950 2022-10-11 16:42:59 +08:00
曹延义 5a91f0130a * Adjust code. 2022-10-11 16:42:42 +08:00
曹延义 d4b88eaf41 * Adjust code. 2022-10-11 16:41:10 +08:00
李玉春 41a26b60b4 Merge branch 'sprint/247_tianshujie_style' into 'master'
Sprint/247 tianshujie style

See merge request easycorp/zentaopms!5729
2022-10-11 08:26:27 +00:00
王怡栋 b59b3babbd Merge branch 'master_xieqiyu_fixbug' into 'master'
Master xieqiyu fixbug

See merge request easycorp/zentaopms!5728
2022-10-11 08:25:44 +00:00
xieqiyu 8f8349b76f * Fix bug#28296. 2022-10-11 14:57:05 +00:00
xieqiyu 4eb54b95e6 * Fix bug#26938. 2022-10-11 14:10:16 +00:00