 王怡栋
|
83ecf656d3
|
Merge branch 'sgm_parentplan' into 'master'
* Code for feedback #397.
See merge request easycorp/zentaopms!4033
(cherry picked from commit beaddb012c)
f0c23584 * Code for feedback #397.
|
2022-06-21 06:28:13 +00:00 |
|
|
王怡栋
|
c30ba304ab
|
Revert "Merge branch 'sgm_parentplan' into 'master'"
This reverts merge request !4033
zentaopms_17.1
|
2022-06-21 06:25:45 +00:00 |
|
|
王怡栋
|
319eda5854
|
Revert "Merge branch 'sgm_fixbug' into 'master'"
This reverts merge request !4034
|
2022-06-21 06:25:08 +00:00 |
|
|
王怡栋
|
7009548c68
|
Merge branch 'sgm_fixbug' into 'master'
* Finish task #57904.
See merge request easycorp/zentaopms!4034
|
2022-06-21 06:09:37 +00:00 |
|
|
王怡栋
|
beaddb012c
|
Merge branch 'sgm_parentplan' into 'master'
* Code for feedback #397.
See merge request easycorp/zentaopms!4033
|
2022-06-21 06:07:46 +00:00 |
|
|
孙广明
|
f5ff0975f8
|
* Finish task #57904.
|
2022-06-21 10:50:21 +08:00 |
|
|
孙广明
|
f0c23584e0
|
* Code for feedback #397.
|
2022-06-21 10:23:58 +08:00 |
|
|
王怡栋
|
0f0fd55ba3
|
Merge branch 'fixbug' into 'master'
* Fix bug .
See merge request easycorp/zentaopms!4025
|
2022-06-20 08:55:48 +00:00 |
|
|
tanghucheng
|
bd259de8ca
|
* Fix bug .
|
2022-06-20 16:54:25 +08:00 |
|
|
孙广明
|
dc87c34cfd
|
Merge branch 'sgm_fixbug' into 'master'
* Fix misc-ping bug.
See merge request easycorp/zentaopms!4023
|
2022-06-20 08:05:49 +00:00 |
|
|
孙广明
|
82245e8a88
|
* Fix misc-ping bug.
|
2022-06-20 16:04:07 +08:00 |
|
|
王怡栋
|
4739911510
|
Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'
* fix bug #23766
See merge request easycorp/zentaopms!4022
|
2022-06-20 07:49:59 +00:00 |
|
|
朱金勇
|
e07244e67e
|
Merge branch 'sprint/wangzemei/bug23919' into 'master'
* fix bug 23919
See merge request easycorp/zentaopms!4021
|
2022-06-20 07:49:56 +00:00 |
|
|
lanzongjun
|
d5afe20770
|
* fix bug #23766
|
2022-06-20 15:46:10 +08:00 |
|
|
zhujinyong
|
0f311a2e2b
|
* Fix recTotal of product list.
|
2022-06-20 15:25:18 +08:00 |
|
|
zhujinyong
|
03b12b84f1
|
* Fix count of product.
|
2022-06-20 15:19:38 +08:00 |
|
|
孙广明
|
ada76d79ac
|
Merge branch 'sprint/scx_commonlang' into 'master'
Sprint/scx commonlang
See merge request easycorp/zentaopms!4019
|
2022-06-20 07:12:20 +00:00 |
|
|
宋辰轩
|
9460102a29
|
* Format.
|
2022-06-20 15:11:29 +08:00 |
|
|
宋辰轩
|
0b83f28fe9
|
* CommonLang.
|
2022-06-20 15:09:59 +08:00 |
|
|
wangzemei
|
f81ffb5c98
|
* fix bug 23919
|
2022-06-20 06:07:39 +00: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 |
|
|
孙广明
|
6d815e5c33
|
Merge branch 'sprint202_leiyong_fix_bug_23874' into 'master'
* Adjust CSS.
See merge request easycorp/zentaopms!4006
|
2022-06-17 06:15:47 +00:00 |
|
|
孙广明
|
0a00dfe217
|
Merge branch 'sprint/203_mayue_bug#23865#23869' into 'master'
* Fix bug #23865#23869.
See merge request easycorp/zentaopms!4000
|
2022-06-17 06:15:36 +00:00 |
|
|
liumengyi
|
4961913efe
|
* Optimize code.
|
2022-06-17 14:15:33 +08:00 |
|