 tianshujie
|
20de2fde71
|
* Fix bug #23930.
|
2022-06-22 11:04:10 +08:00 |
|
|
王怡栋
|
0e847b9645
|
Merge branch 'sprint/206_liumengyi_58063' into 'sprint/206'
Sprint/206 liumengyi 58063
See merge request easycorp/zentaopms!4053
|
2022-06-22 02:39:17 +00:00 |
|
|
孙广明
|
6ab82bfcb9
|
Merge branch 'sprint/206_tianshujie_57893' into 'sprint/206'
Sprint/206 tianshujie 57893
See merge request easycorp/zentaopms!4052
|
2022-06-22 02:06:42 +00:00 |
|
|
liumengyi
|
2fce450bb8
|
* Fix bug for task #58063.
|
2022-06-22 09:54:08 +08:00 |
|
|
tianshujie
|
3c428752cc
|
* Finish task #57893.
|
2022-06-22 09:45:54 +08:00 |
|
|
liumengyi
|
8c229fa6bc
|
* Finish task #58063.
|
2022-06-22 08:59:29 +08:00 |
|
|
tianshujie
|
226a7fc69b
|
* Finish task #57893.
|
2022-06-21 16:37:35 +08:00 |
|
|
tianshujie
|
f6f4bc5f7c
|
* Finish task #57894.
|
2022-06-21 15:13:21 +08:00 |
|
|
王怡栋
|
a39f52ef08
|
Merge branch 'sprint/206_tianshujie_24005' into 'sprint/206'
* Fix bug #24005.
See merge request easycorp/zentaopms!4043
|
2022-06-21 06:55:27 +00:00 |
|
|
tianshujie
|
a6db8b4999
|
* Fix bug #24005.
|
2022-06-21 14:54:17 +08:00 |
|
|
王怡栋
|
09c555e879
|
Merge branch 'sprint/206_tianshujie_57894' into 'sprint/206'
Sprint/206 tianshujie 57894
See merge request easycorp/zentaopms!4039
|
2022-06-21 06:07:10 +00:00 |
|
|
tianshujie
|
42aa5a0f28
|
* Finish task #57894.
|
2022-06-21 14:05:36 +08:00 |
|
|
tianshujie
|
aab46a8414
|
* Finish task #57894.
|
2022-06-21 13:55:06 +08:00 |
|
|
tianshujie
|
d3408b9212
|
* Finish task #57894.
|
2022-06-21 13:52:27 +08:00 |
|
|
tianshujie
|
367f96a886
|
* Finish task #57894.
|
2022-06-21 13:47:08 +08:00 |
|
|
tianshujie
|
b812104494
|
* Finish task #57894.
|
2022-06-21 13:14:06 +08:00 |
|
|
tianshujie
|
9585c4f031
|
* Finish task #57894.
|
2022-06-21 11:26:07 +08:00 |
|
|
tianshujie
|
30bff5f852
|
* Finish task #57894.
|
2022-06-21 11:15:16 +08:00 |
|
|
王怡栋
|
51e9deda40
|
Merge branch 'sprint/206_tianshujie_57895' into 'sprint/206'
Sprint/206 tianshujie 57895
See merge request easycorp/zentaopms!4026
|
2022-06-20 09:11:50 +00:00 |
|
|
tianshujie
|
69df74b3c5
|
* Finish task #57895.
|
2022-06-20 17:11:02 +08:00 |
|
|
tianshujie
|
24fcb20079
|
* Finish task #57895.
|
2022-06-20 17:04:29 +08:00 |
|
|
tianshujie
|
503f0feaa1
|
* Delete useless code.
|
2022-06-20 14:41:23 +08:00 |
|
|
tianshujie
|
837849a41a
|
* Finish task #57895.
|
2022-06-20 14:38:48 +08:00 |
|
|
王怡栋
|
946d5cb782
|
Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'
* fix bug #23766
See merge request easycorp/zentaopms!4015
|
2022-06-20 03:18:59 +00:00 |
|
|
王怡栋
|
233d78e4b7
|
Merge branch 'fixbug' into 'master'
* Fix bug #23908,23888.
See merge request easycorp/zentaopms!4016
|
2022-06-20 03:18:37 +00:00 |
|
|
lanzongjun
|
6786b4d08c
|
* fix bug #23932
|
2022-06-20 11:17:34 +08:00 |
|
|
tanghucheng
|
09268cfe23
|
* Fix bug .
|
2022-06-20 10:50:54 +08:00 |
|
|
lanzongjun
|
2c49643589
|
* fix bug #23766
|
2022-06-20 09:40:46 +08:00 |
|
|
lanzongjun
|
898bb949c1
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/master_lanzongjun_fixbug
|
2022-06-20 09:30:53 +08:00 |
|
|
zhujinyong
|
c2bff85082
|
* Fix fail of ciresult.
|
2022-06-20 08:50:47 +08:00 |
|
|
孙广明
|
11c5cd1999
|
Merge branch 'sprint/sunhao/apps_loading_state'
|
2022-06-18 00:10:31 +08:00 |
|
|
Hao Sun
|
584bf73577
|
* update zui lib.
|
2022-06-17 15:54:16 +00:00 |
|
|
Hao Sun
|
ef0f9634be
|
* add loading indicator on loading apps.
|
2022-06-17 15:35:36 +00:00 |
|
|
孙广明
|
4f9388e5e6
|
Merge branch 'sprint/sunhao/optimize_program_list' into 'master'
* fix table with nested option not work as expected.
See merge request easycorp/zentaopms!4013
|
2022-06-17 15:24:25 +00:00 |
|
|
Hao Sun
|
a8d212e213
|
* fix table with nested option not work as expected.
|
2022-06-17 15:18:08 +00:00 |
|
|
王怡栋
|
619c03be5d
|
Merge branch 'sgm_fixbug' into 'master'
* Code for product order.
See merge request easycorp/zentaopms!4012
|
2022-06-17 08:26:27 +00:00 |
|
|
孙广明
|
9ac3ed7851
|
* Code for product order.
|
2022-06-17 16:23:46 +08:00 |
|
|
王怡栋
|
e2439f2a5c
|
Merge branch 'sprint/master_tanghucheng' into 'master'
* Fix bug #23891.
See merge request easycorp/zentaopms!4011
|
2022-06-17 08:19:30 +00:00 |
|
|
孙广明
|
6ff93fcc13
|
Merge branch 'sprint/sunhao/optimize_program_list' into 'master'
* optimize program list, support to preserve nested state.
See merge request easycorp/zentaopms!4010
|
2022-06-17 08:06:58 +00:00 |
|
|
Hao Sun
|
72d4c854d3
|
* prevent user move row by click a link.
|
2022-06-17 07:39:03 +00:00 |
|
|
Hao Sun
|
775746df0a
|
* optimize program list, support to preserve nested state.
|
2022-06-17 07:31:51 +00:00 |
|
|
lanzongjun
|
3b7adad82e
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/master_lanzongjun_fixbug
|
2022-06-17 15:29:36 +08:00 |
|
|
tanghucheng
|
9d92db9900
|
* Fix bug #23891.
|
2022-06-17 15:25:12 +08:00 |
|
|
孙广明
|
642b518397
|
Merge branch 'codeReview' into 'master'
codeReview
See merge request easycorp/zentaopms!4004
|
2022-06-17 07:11:23 +00:00 |
|
|
sunjun
|
ca2b45736b
|
codeReview
|
2022-06-17 07:04:52 +00:00 |
|
|
孙广明
|
960ce0c856
|
Merge branch 'sprint/204_tianshujie_23918' into 'master'
* Fix bug #23918.
See merge request easycorp/zentaopms!4009
|
2022-06-17 07:00:20 +00:00 |
|
|
tianshujie
|
d95a2fee68
|
* Fix bug #23918.
|
2022-06-17 14:59:22 +08:00 |
|
|
孙广明
|
998064caf0
|
Merge branch 'sprint/203_mayue_bug#23868' into 'master'
* Fix bug #23868.
See merge request easycorp/zentaopms!4008
|
2022-06-17 06:56:27 +00:00 |
|
|
mayue
|
2295ee69d5
|
* Fix bug #23868.
|
2022-06-17 14:55:25 +08:00 |
|
|
孙广明
|
16dd9ad238
|
Merge branch 'sprint/fixbug_liumengyi' into 'master'
* Optimize code.
See merge request easycorp/zentaopms!4007
|
2022-06-17 06:21:22 +00:00 |
|