 孙广明
|
b52c8bbafd
|
Merge branch 'sprint/185_zxd_49307' into 'sprint/185'
Sprint/185 zxd 49307
See merge request easycorp/zentaopms!1841
|
2022-02-17 07:31:29 +00:00 |
|
|
liyuchun
|
1f860b319c
|
Merge branch 'sprint/185_zhengrunyu_49286' into sprint/185
|
2022-02-17 15:25:34 +08:00 |
|
|
李玉春
|
62097d0731
|
Merge branch 'sprint/185' into 'sprint/185_zhengrunyu_49286'
# Conflicts:
# db/update16.4.sql
|
2022-02-17 07:23:41 +00:00 |
|
|
孙广明
|
a44789c872
|
Merge branch 'sprint/185_liumengyi_49371' into 'sprint/185'
* Finish task #49371.
See merge request easycorp/zentaopms!1840
|
2022-02-17 07:22:54 +00:00 |
|
|
zhouxudong
|
54c7b99bc6
|
* Add space.
|
2022-02-17 15:21:42 +08:00 |
|
|
liumengyi
|
c7fb090e53
|
* Code for task #49371.
|
2022-02-17 15:21:19 +08:00 |
|
|
liumengyi
|
99fa224404
|
* Finish task #49371.
|
2022-02-17 15:07:51 +08:00 |
|
|
liumengyi
|
c6174efcea
|
* Finish task #49371.
|
2022-02-17 15:06:48 +08:00 |
|
|
zhouxudong
|
aae63736d3
|
*Finish task #49307.
|
2022-02-17 15:05:22 +08:00 |
|
|
zhengrunyu
|
3dbbc4b3f0
|
*Finish task 49286.
|
2022-02-17 15:02:18 +08:00 |
|
|
孙广明
|
36eec1ed28
|
Merge branch 'sprint/185_mayue_Bug11007' into 'sprint/185'
* Fix bug #11007.
See merge request easycorp/zentaopms!1836
|
2022-02-17 06:37:25 +00:00 |
|
|
zhengrunyu
|
56b22d9b83
|
* Add sql
|
2022-02-17 14:35:30 +08:00 |
|
|
孙广明
|
cb2ebf1727
|
Merge branch 'sprint/185_fixbug_wangyidong' into 'sprint/185'
Sprint/185 fixbug wangyidong
See merge request easycorp/zentaopms!1833
|
2022-02-17 05:53:08 +00:00 |
|
|
王怡栋
|
3f72bfc6b7
|
Merge branch 'sprint/185' of https://gitlab.zcorp.cc/easycorp/zentaopms into 185
|
2022-02-17 11:09:17 +08:00 |
|
|
王怡栋
|
959ac74bd4
|
Merge branch 'sprint/185_lwr_fixMerge' into 'sprint/185'
Fix merge
See merge request easycorp/zentaopms!1831
|
2022-02-17 03:08:20 +00:00 |
|
|
王怡栋
|
7064d365d7
|
Merge branch 'sgm_185' into 'sprint/185'
* Finish task #49429.
See merge request easycorp/zentaopms!1830
|
2022-02-17 03:07:57 +00:00 |
|
|
王怡栋
|
cbcbe766a4
|
Merge branch 'sprint/185_tanghucheng_fixbug' into 'sprint/185'
* fix bug.
See merge request easycorp/zentaopms!1832
|
2022-02-17 03:07:21 +00:00 |
|
|
王怡栋
|
3ebcfb1ddc
|
* fix bug #19693.
|
2022-02-17 11:06:28 +08:00 |
|
|
tanghucheng
|
f05ad59be3
|
* fix bug.
|
2022-02-17 11:04:10 +08:00 |
|
|
zhengrunyu
|
5083af2323
|
*Finish task 49286.
|
2022-02-17 10:47:56 +08:00 |
|
|
Wenrui LI
|
4ec144c99e
|
* fix bad merge.
|
2022-02-17 10:42:11 +08:00 |
|
|
孙广明
|
19f7a89486
|
* Finish task #49429.
|
2022-02-17 10:41:12 +08:00 |
|
|
孙广明
|
bd31f6f4ff
|
Merge branch 'sprint/185_liumengyi_fixbug' into 'sprint/185'
* Fix bug for kanban priv.
See merge request easycorp/zentaopms!1829
|
2022-02-17 02:37:17 +00:00 |
|
|
liumengyi
|
6dc1c744a1
|
* Fix bug for kanban priv.
|
2022-02-17 10:34:17 +08:00 |
|
|
zhouxudong
|
5473987cb0
|
*Finish task #49307.
|
2022-02-17 10:24:37 +08:00 |
|
|
zhujinyong
|
d02ddc138c
|
Merge branch 'lite' into sprint/185
|
2022-02-17 10:20:50 +08:00 |
|
|
mayue
|
e80390a8f2
|
* Fix bug #11007.
|
2022-02-17 09:35:33 +08:00 |
|
|
zhujinyong
|
5bd64d9312
|
Merge branch 'lite' into sprint/185
|
2022-02-17 08:56:40 +08:00 |
|
|
liyuchun
|
a7bcb16751
|
Merge branch '185_fixbug' into 185
|
2022-02-17 08:24:32 +08:00 |
|
|
tanghucheng
|
39516e5d70
|
* fix bug #19657.
|
2022-02-16 17:07:20 +08:00 |
|
|
tanghucheng
|
8104870b83
|
* code for task #49080.
|
2022-02-16 15:11:44 +08:00 |
|
|
孙广明
|
e9a29f39fc
|
* Fix details.
|
2022-02-16 13:05:56 +08:00 |
|
|
孙广明
|
7f50a2cbd9
|
* Fix code error.
|
2022-02-16 11:26:40 +08:00 |
|
|
tanghucheng
|
0cbd84fdf2
|
* code for task#48889.
|
2022-02-16 11:21:07 +08:00 |
|
|
tanghucheng
|
220c0a09c3
|
* code for task#48884.
|
2022-02-16 10:38:54 +08:00 |
|
|
tanghucheng
|
e837186eba
|
* code for task #49081.
|
2022-02-16 10:27:36 +08:00 |
|
|
tanghucheng
|
1db5a70ec9
|
* code for task#49015.
|
2022-02-16 10:16:58 +08:00 |
|
|
孙广明
|
b963b38547
|
* Fix details.
|
2022-02-16 10:09:34 +08:00 |
|
|
孙广明
|
127da2bfc6
|
* Add finished notice.
|
2022-02-16 10:04:55 +08:00 |
|
|
孙广明
|
7cfb1c2e9c
|
Merge branch 'tianshujie_19306' into 'master'
* Fix bug #19306.
See merge request easycorp/zentaopms!1819
|
2022-02-16 01:58:28 +00:00 |
|
|
tianshujie
|
e22bd59961
|
* Fix bug #19306.
|
2022-02-16 09:57:17 +08:00 |
|
|
朱金勇
|
c9b8ad34a6
|
Merge branch 'sprint/scx_editorlang' into 'master'
*Translate lang.
See merge request easycorp/zentaopms!1818
|
2022-02-16 01:42:30 +00:00 |
|
|
孙广明
|
b44ac97ace
|
Merge branch 'sprint/184_hufangzhou_19649' into 'master'
* Fix bug #19649.
See merge request easycorp/zentaopms!1817
|
2022-02-16 01:41:32 +00:00 |
|
|
songchenxuan
|
b7eacca5eb
|
*Translate lang.
|
2022-02-16 09:37:37 +08:00 |
|
|
孙广明
|
abb38d4709
|
* Fix details.
|
2022-02-16 09:36:21 +08:00 |
|
|
hufangzhou
|
f9cc2702f9
|
* Fix bug #19649.
|
2022-02-16 09:24:11 +08:00 |
|
|
tanghucheng
|
0f8a2e8172
|
* fix bug .
|
2022-02-16 08:53:30 +08:00 |
|
|
孙广明
|
3332272ff9
|
Merge branch 'sprint/184_hufangzhou_19558' into 'master'
* Fix bug #19558.
See merge request easycorp/zentaopms!1815
|
2022-02-16 00:34:32 +00:00 |
|
|
tanghucheng
|
879d3c2f17
|
* fix bug.
|
2022-02-16 08:32:47 +08:00 |
|
|
tanghucheng
|
cfb17ef6e3
|
* fix bug.
|
2022-02-16 07:55:51 +08:00 |
|