 王怡栋
|
f4edba03f1
|
Merge branch 'zentaopms_263_wangyuting' into 'master'
* Optimize code.
See merge request easycorp/zentaopms!6302
|
2022-11-22 08:31:35 +00:00 |
|
|
王怡栋
|
04ced67953
|
Merge branch 'zentaopms_263_task_#77143' into 'master'
* Finish task #77143.
See merge request easycorp/zentaopms!6301
|
2022-11-22 08:31:21 +00:00 |
|
|
王怡栋
|
72106fa341
|
Merge branch 'master_feedback_1468' into 'master'
* Adjust code for feedback #1468.
See merge request easycorp/zentaopms!6300
|
2022-11-22 08:02:34 +00:00 |
|
|
王怡栋
|
827f04e98a
|
* fix bug #30094.
|
2022-11-22 15:34:40 +08:00 |
|
|
王怡栋
|
a1cded3942
|
Merge branch 'zentaopms_263_task#77131'
|
2022-11-22 15:08:29 +08:00 |
|
|
王怡栋
|
0699b9e061
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms
|
2022-11-22 15:07:51 +08:00 |
|
|
王怡栋
|
b996270738
|
* code for task #77138.
|
2022-11-22 14:56:48 +08:00 |
|
|
王怡栋
|
c8abe9f23a
|
Merge branch 'zentaopms_263_task#77140' into 'master'
* Finish task #77140.
See merge request easycorp/zentaopms!6297
|
2022-11-22 06:39:17 +00:00 |
|
|
王怡栋
|
18d88bad03
|
Merge branch 'tianshujie_fixbug' into 'master'
* Fixed pager jump error in the use case list.
See merge request easycorp/zentaopms!6294
|
2022-11-22 06:01:41 +00:00 |
|
|
王怡栋
|
44caf18a51
|
Merge branch 'zentaopms_263_task#77130' into 'master'
* Finish task #77130.
See merge request easycorp/zentaopms!6292
|
2022-11-22 06:01:07 +00:00 |
|
|
王怡栋
|
a2d5371030
|
* code for task #77138,77135,77134,77133,77132,77129.
|
2022-11-22 13:54:33 +08:00 |
|
|
王怡栋
|
bac4eeab8b
|
* code for task #77135.
|
2022-11-22 13:39:28 +08:00 |
|
|
王怡栋
|
3ac62d87a1
|
* code for task #77138.
|
2022-11-22 12:07:53 +08:00 |
|
|
王怡栋
|
816abf82d4
|
Merge branch 'zentaopms_263_task#77136' into 'master'
* Finish task #77136.
See merge request easycorp/zentaopms!6290
|
2022-11-22 02:24:55 +00:00 |
|
|
王怡栋
|
3b6b770d72
|
* fix bug #30068.
|
2022-11-22 09:45:05 +08:00 |
|
|
王怡栋
|
d30344e2ca
|
* fix bug #29555.
|
2022-11-22 09:01:12 +08:00 |
|
|
王怡栋
|
52c59a98e0
|
* fix bug #30005.
|
2022-11-22 09:01:12 +08:00 |
|
|
王怡栋
|
d16ba0ba54
|
Merge branch 'zentaopms_263_bug#29949' into 'master'
* Fix bug #29949.
See merge request easycorp/zentaopms!6283
|
2022-11-21 08:53:55 +00:00 |
|
|
王怡栋
|
62cd6de63a
|
Merge branch 'zentaopms_263_wangyuting' into 'master'
Zentaopms 263 wangyuting
See merge request easycorp/zentaopms!6282
|
2022-11-21 08:53:38 +00:00 |
|
|
王怡栋
|
cb1015130a
|
Merge branch 'zentaopms_263_bug#29639' into 'master'
* Fix bug #29639.
See merge request easycorp/zentaopms!6280
|
2022-11-21 08:53:18 +00:00 |
|
|
王怡栋
|
f3d4aa99b0
|
Merge branch 'zentaopms_263_bug#30039' into 'master'
* Fix bug #30039.
See merge request easycorp/zentaopms!6279
|
2022-11-21 08:52:59 +00:00 |
|
|
王怡栋
|
5d92d10f6f
|
Merge branch 'zentaopms_263_bug#29950' into 'master'
* Fix bug #29950.
See merge request easycorp/zentaopms!6278
|
2022-11-21 08:52:44 +00:00 |
|
|
王怡栋
|
566083b6fe
|
Merge branch 'sprint/wangzemei/29616' into 'master'
* fix bug 29616
See merge request easycorp/zentaopms!6285
|
2022-11-21 08:52:15 +00:00 |
|
|
王怡栋
|
7a47096356
|
* fix bug #30007.
|
2022-11-21 14:10:53 +08:00 |
|
|
王怡栋
|
b816b78e4a
|
Merge branch 'tanghucheng_fixbug' into 'master'
* Fix bug #30011.
See merge request easycorp/zentaopms!6272
|
2022-11-21 05:27:54 +00:00 |
|
|
王怡栋
|
223546510d
|
Merge branch 'zentaopms_263_bug#29561' into 'master'
* Fix bug #29561.
See merge request easycorp/zentaopms!6270
|
2022-11-21 05:27:16 +00:00 |
|
|
王怡栋
|
3370266e03
|
Merge branch 'zentaopms_263_bug#28274' into 'master'
* Fix bug #28274.
See merge request easycorp/zentaopms!6267
|
2022-11-21 05:26:39 +00:00 |
|
|
王怡栋
|
26d0d54c22
|
Merge branch 'zentaopms_263_bug#30000' into 'master'
* Fix bug #30000.
See merge request easycorp/zentaopms!6266
|
2022-11-21 05:26:23 +00:00 |
|
|
王怡栋
|
2fb3ed6fd9
|
Merge branch 'zentaopms_263_bug_subprogram' into 'master'
* Display all products of the top program.
See merge request easycorp/zentaopms!6265
|
2022-11-21 05:26:07 +00:00 |
|
|
王怡栋
|
2020fd2ae7
|
Merge branch 'zentaopms_263_bug#30003' into 'master'
* Fix bug #30003.
See merge request easycorp/zentaopms!6264
|
2022-11-21 05:25:28 +00:00 |
|
|
王怡栋
|
111f145d61
|
* fix bug #29953.
|
2022-11-21 13:23:13 +08:00 |
|
|
王怡栋
|
3852627523
|
* fix bug #29557.
|
2022-11-21 11:30:59 +08:00 |
|
|
王怡栋
|
d9e22f5976
|
* fix bug #29670.
|
2022-11-21 10:48:07 +08:00 |
|
|
王怡栋
|
e993d07670
|
* fix bug for show build.
|
2022-11-21 09:29:19 +08:00 |
|
|
王怡栋
|
e55339258b
|
Merge branch 'master_feedback_1353' into 'master'
* Resolved feedback #1353.
See merge request easycorp/zentaopms!6015
|
2022-11-21 01:16:39 +00:00 |
|
|
王怡栋
|
68e6f5695f
|
Merge branch 'master_feedback_1468' into 'master'
* Adjust code for feedback #1468.
See merge request easycorp/zentaopms!6261
|
2022-11-21 00:53:18 +00:00 |
|
|
王怡栋
|
e1a7dfb06e
|
Merge branch 'sprint/hufangzhou_sql' into 'master'
* Adjust the standard sql.
See merge request easycorp/zentaopms!6262
|
2022-11-21 00:51:03 +00:00 |
|
|
王怡栋
|
40e9827d45
|
Merge branch 'tianshujie_fixbug' into 'master'
Tianshujie fixbug
See merge request easycorp/zentaopms!6260
|
2022-11-18 08:29:41 +00:00 |
|
|
王怡栋
|
1db91b628a
|
Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'
* Fix bug #29442#29695
See merge request easycorp/zentaopms!6258
|
2022-11-18 08:28:55 +00:00 |
|
|
王怡栋
|
29cddd773a
|
* fix bug #75779.
|
2022-11-18 16:25:14 +08:00 |
|
|
王怡栋
|
9274950e61
|
Merge branch 'tanghucheng_fixbug' into 'master'
* Fix bug #24065,23090.
See merge request easycorp/zentaopms!6256
|
2022-11-18 07:24:22 +00:00 |
|
|
王怡栋
|
c14659e8d8
|
Merge branch 'zentaopms_258_bug#28221' into 'master'
* Fix bug #28221.
See merge request easycorp/zentaopms!6254
|
2022-11-18 07:23:35 +00:00 |
|
|
王怡栋
|
d8f5a8bb60
|
Merge branch 'tianshujie_css' into 'master'
* Modify the execution name width problem in the execution list.
See merge request easycorp/zentaopms!6253
|
2022-11-18 07:23:13 +00:00 |
|
|
王怡栋
|
28f7de276c
|
Merge branch 'master_xieqiyu_76490' into 'master'
* Fix bug#29677.
See merge request easycorp/zentaopms!6252
|
2022-11-18 07:22:17 +00:00 |
|
|
王怡栋
|
7961c8bc55
|
Merge branch 'master_feedback_1468' into 'master'
Master feedback 1468
See merge request easycorp/zentaopms!6251
|
2022-11-18 07:22:01 +00:00 |
|
|
王怡栋
|
68eb73e7ff
|
Merge branch 'zentaopms_261_bug_#29977' into 'master'
* Fix bug #29977.
See merge request easycorp/zentaopms!6250
|
2022-11-18 07:21:02 +00:00 |
|
|
王怡栋
|
c4c367d34a
|
Merge branch 'cyy_bug' into 'master'
* Fix bug #29974.
See merge request easycorp/zentaopms!6249
|
2022-11-18 07:20:38 +00:00 |
|
|
王怡栋
|
350d74575e
|
Merge branch 'master_xieqiyu_29990' into 'master'
* Fix bug#29990.
See merge request easycorp/zentaopms!6248
|
2022-11-18 07:20:08 +00:00 |
|
|
王怡栋
|
abfdcaa4f5
|
Merge branch 'zentaopms_261_bug_#29948' into 'master'
* Fix bug #29948.
See merge request easycorp/zentaopms!6247
|
2022-11-18 07:19:49 +00:00 |
|
|
王怡栋
|
c291211ac9
|
Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'
* Fix task #76459
See merge request easycorp/zentaopms!6246
|
2022-11-18 07:19:36 +00:00 |
|
|
王怡栋
|
47dd0a2a4d
|
Merge branch 'zentaopms_258_bug#29942' into 'master'
* Fix bug #29942.
See merge request easycorp/zentaopms!6245
|
2022-11-18 07:19:03 +00:00 |
|
|
王怡栋
|
a8e22a8884
|
Merge branch 'zentaopms_261_bug_#29653' into 'master'
* Fix bug #29653.
See merge request easycorp/zentaopms!6244
|
2022-11-18 07:18:49 +00:00 |
|
|
王怡栋
|
6164fa0c69
|
Merge branch 'zentaopms_258_bug#29959' into 'master'
* Fix bug #29959.
See merge request easycorp/zentaopms!6243
|
2022-11-18 07:18:30 +00:00 |
|
|
王怡栋
|
07117610a7
|
Merge branch 'zentaopms_261_bug_#29931' into 'master'
* Fix bug #29931.
See merge request easycorp/zentaopms!6242
|
2022-11-18 07:17:53 +00:00 |
|
|
王怡栋
|
988f80e133
|
Merge branch 'zentaopms261_wyd' into 'master'
* adjust for create release.
See merge request easycorp/zentaopms!6257
|
2022-11-18 07:10:55 +00:00 |
|
|
王怡栋
|
07c1b0cc45
|
* adjust for create release.
|
2022-11-18 15:09:21 +08:00 |
|
|
王怡栋
|
8aeb743c8f
|
Merge branch 'zentaopms261_wyd' into 'master'
Zentaopms261 wyd
See merge request easycorp/zentaopms!6255
|
2022-11-18 06:42:59 +00:00 |
|
|
王怡栋
|
1c0129945c
|
* code for task #76439,76440.
|
2022-11-18 14:25:24 +08:00 |
|
|
王怡栋
|
fb9aa7d0dd
|
* code for task #76438.
|
2022-11-18 10:57:15 +08:00 |
|
|
王怡栋
|
db540eb67a
|
* code for task #76438.
|
2022-11-18 10:53:30 +08:00 |
|
|
王怡栋
|
cd0500cdf9
|
Merge branch 'zentaopms_258_wangyuting' into 'master'
* Fix unlink btn class bug.
See merge request easycorp/zentaopms!6240
|
2022-11-18 02:35:25 +00:00 |
|
|
王怡栋
|
94d49f0799
|
Merge branch 'master_xieqiyu_76453' into 'master'
* Fix bug#29969.
See merge request easycorp/zentaopms!6238
|
2022-11-18 02:34:21 +00:00 |
|
|
王怡栋
|
b0d617966e
|
Merge branch 'sprint/zentaopms262_mayue_bug#29944' into 'master'
* Fix bug #29944.
See merge request easycorp/zentaopms!6241
|
2022-11-18 02:34:04 +00:00 |
|
|
王怡栋
|
a73719e9ed
|
Merge branch 'master_xieqiyu_76419' into 'master'
* Fix bug#29742.
See merge request easycorp/zentaopms!6237
|
2022-11-18 02:11:06 +00:00 |
|
|
王怡栋
|
787128c30e
|
Merge branch 'cyy_bug' into 'master'
Cyy bug
See merge request easycorp/zentaopms!6235
|
2022-11-18 02:10:53 +00:00 |
|
|
王怡栋
|
d599d1849e
|
Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'
* Fix bug #29947 task #76414
See merge request easycorp/zentaopms!6232
|
2022-11-18 02:10:34 +00:00 |
|
|
王怡栋
|
d51ac9506a
|
Merge branch 'tianshujie_bug' into 'master'
* Modified Obtain the configuration information about the workweek.
See merge request easycorp/zentaopms!6229
|
2022-11-18 02:09:50 +00:00 |
|
|
王怡栋
|
028547730b
|
Merge branch 'fixbug' into 'master'
* Finish ticket #043.
See merge request easycorp/zentaopms!6227
|
2022-11-18 02:09:38 +00:00 |
|
|
王怡栋
|
f2502c5737
|
Merge branch 'sprint/xuanxuan_121' into 'master'
Sprint/xuanxuan 121
See merge request easycorp/zentaopms!5825
|
2022-11-18 02:08:40 +00:00 |
|
|
王怡栋
|
2f270f3808
|
Merge branch 'sprint/zentaopms262_mayue_bug#29755' into 'master'
* Fix bug #29755.
See merge request easycorp/zentaopms!6233
|
2022-11-18 00:37:39 +00:00 |
|
|
王怡栋
|
e4c02e2857
|
Merge branch 'zentaopms_258_task#76435' into 'master'
* Finish task #76435、76436、76437.
See merge request easycorp/zentaopms!6234
|
2022-11-17 08:47:30 +00:00 |
|
|
王怡栋
|
9d7b30f699
|
Merge branch 'zentaopms_258_task#76434' into 'master'
* Finish task #76434.
See merge request easycorp/zentaopms!6231
|
2022-11-17 08:47:11 +00:00 |
|
|
王怡栋
|
6c72e8755c
|
Merge branch 'sprint/hufangzhou_xuan_commit' into 'master'
* Adjust xuanxuan commit.
See merge request easycorp/zentaopms!6224
|
2022-11-17 06:54:23 +00:00 |
|
|
王怡栋
|
f2a619e7f2
|
Merge branch 'xuan_fix_global_search' into 'master'
* fix getBoundingClientRect of undefined.
See merge request easycorp/zentaopms!6225
|
2022-11-17 06:54:09 +00:00 |
|
|
王怡栋
|
93106a919b
|
Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'
* Fix task #76407#76411
See merge request easycorp/zentaopms!6223
|
2022-11-17 06:53:02 +00:00 |
|
|
王怡栋
|
6146fb46bd
|
Merge branch 'zentaopms_258_bug#29924' into 'master'
* Fix bug #29924.
See merge request easycorp/zentaopms!6219
|
2022-11-17 06:52:10 +00:00 |
|
|
王怡栋
|
4594970a5b
|
Merge branch 'zentaopms_258_bug#29636' into 'master'
Zentaopms 258 bug#29636
See merge request easycorp/zentaopms!6217
|
2022-11-17 06:51:50 +00:00 |
|
|
王怡栋
|
bd06894530
|
Merge branch 'zentaopms_258_bug#29929' into 'master'
* Fix bug #29929.
See merge request easycorp/zentaopms!6216
|
2022-11-17 06:51:38 +00:00 |
|
|
王怡栋
|
515ee5c5c1
|
Merge branch 'sprint/zentaopms262_mayue_bug#29428' into 'master'
* Fix bug #29428.
See merge request easycorp/zentaopms!6226
|
2022-11-17 06:51:22 +00:00 |
|
|
王怡栋
|
6d2f954054
|
Merge branch 'sprint/zentaopms262_mayue_bug#29468' into 'master'
* Fix bug #29468.
See merge request easycorp/zentaopms!6221
|
2022-11-17 06:50:51 +00:00 |
|
|
王怡栋
|
93a772e01e
|
* fix bug #29834.
|
2022-11-17 14:01:33 +08:00 |
|
|
王怡栋
|
fc2945ccbd
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms
|
2022-11-17 11:11:34 +08:00 |
|
|
王怡栋
|
2b7f25bc6c
|
* fix bug #29838.
|
2022-11-17 11:10:17 +08:00 |
|
|
王怡栋
|
3cd2f91458
|
Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'
* Fix task #76409
See merge request easycorp/zentaopms!6215
|
2022-11-17 02:13:19 +00:00 |
|
|
王怡栋
|
2e081b8df3
|
Merge branch 'zentaopms_258_bug#29639' into 'master'
* Fix bug #29639.
See merge request easycorp/zentaopms!6214
|
2022-11-17 02:13:05 +00:00 |
|
|
王怡栋
|
17caecc9af
|
Merge branch 'zentaopms_261_bug_#29658' into 'master'
* Fix bug #29658.
See merge request easycorp/zentaopms!6213
|
2022-11-17 02:12:47 +00:00 |
|
|
王怡栋
|
8ae7bd1a00
|
Merge branch 'sprint/zentaopms262_mayue_bug#28841' into 'master'
* Fix bug #28841.
See merge request easycorp/zentaopms!6208
|
2022-11-17 02:02:55 +00:00 |
|
|
王怡栋
|
ec4c6b47a8
|
Merge branch 'master_xieqiyu_76406' into 'master'
* Fix bug#29831.
See merge request easycorp/zentaopms!6211
|
2022-11-17 02:02:43 +00:00 |
|
|
王怡栋
|
b834f7f703
|
Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'
* Fix task #76408
See merge request easycorp/zentaopms!6210
|
2022-11-17 02:01:46 +00:00 |
|
|
王怡栋
|
a4902975fd
|
Merge branch 'master_xieqiyu_76420' into 'master'
* Fix bug#29716.
See merge request easycorp/zentaopms!6209
|
2022-11-17 02:01:27 +00:00 |
|
|
王怡栋
|
468ae934f4
|
Merge branch 'master_xieqiyu_code' into 'master'
* Fallback code for bug#29896.
See merge request easycorp/zentaopms!6207
|
2022-11-17 02:00:50 +00:00 |
|
|
王怡栋
|
734837ad2e
|
Merge branch 'sprint/zentaopms262_mayue_bug#29817' into 'master'
* Fix bug #29817.
See merge request easycorp/zentaopms!6212
|
2022-11-17 01:58:10 +00:00 |
|
|
王怡栋
|
a379e64860
|
Merge branch 'zentaopms_261_bug_#29652' into 'master'
* Fix bug #29652.
See merge request easycorp/zentaopms!6206
|
2022-11-17 01:57:57 +00:00 |
|
|
王怡栋
|
6425496407
|
Merge branch 'zentaopms261_wyd'
|
2022-11-17 09:55:27 +08:00 |
|
|
王怡栋
|
6c0a92fa65
|
* adjust for sync build to release.
|
2022-11-17 09:40:51 +08:00 |
|
|
王怡栋
|
0fdbf58dc9
|
* adjust code.
|
2022-11-16 17:09:07 +08:00 |
|
|
王怡栋
|
f4452f6d04
|
* fix for link story and bug for project release.
|
2022-11-16 17:06:12 +08:00 |
|
|
王怡栋
|
6b8fba345d
|
Merge branch 'feedback_1231' into 'master'
* Fix feedback#1231
See merge request easycorp/zentaopms!6202
|
2022-11-16 08:48:12 +00:00 |
|
|
王怡栋
|
8848d5c462
|
Merge branch 'sprint/tianshujie_css' into 'master'
* Adjust plan box of create project pager.
See merge request easycorp/zentaopms!6198
|
2022-11-16 07:29:38 +00:00 |
|
|
王怡栋
|
6cc66fad4f
|
Merge branch 'sprint/180beta1_hufangzhou_newVersion' into 'master'
* Add the new version.
See merge request easycorp/zentaopms!6197
|
2022-11-16 07:29:23 +00:00 |
|