 zhouxin
|
aecbd58d24
|
Tmp.
|
2022-02-21 03:07:12 +00:00 |
|
|
李玉春
|
96c32c4df2
|
Merge branch 'sprint/185_zxd_49296' into 'sprint/185'
* Finish task #49296.
See merge request easycorp/zentaopms!1860
|
2022-02-21 02:39:05 +00:00 |
|
|
zhujinyong
|
4f32cb8a1c
|
+ Add xuan extension.
|
2022-02-21 10:30:38 +08:00 |
|
|
zhouxudong
|
ae2ad29753
|
* Finish task #49296.
|
2022-02-21 09:56:42 +08:00 |
|
|
李玉春
|
c280365ce8
|
Merge branch 'sprint/185_zhengrunyu_49303' into 'sprint/185'
Sprint/185 zhengrunyu 49303
See merge request easycorp/zentaopms!1857
|
2022-02-21 01:27:02 +00:00 |
|
|
zhengrunyu
|
1a8f317229
|
*Finish task 49303
|
2022-02-21 09:07:30 +08:00 |
|
|
孙广明
|
176a8fa648
|
Merge branch 'sprint/185_xieqiyu_49308' into 'sprint/185'
* Finish task#49308.
See merge request easycorp/zentaopms!1849
|
2022-02-18 07:40:04 +00:00 |
|
|
孙广明
|
17b10d3e4f
|
Merge branch 'sprint/185_fixbug_wangyidong' into sprint/185
|
2022-02-18 15:25:36 +08:00 |
|
|
孙广明
|
e90059443b
|
Merge branch 'sprint/185' into 'sprint/185_fixbug_wangyidong'
# Conflicts:
# module/common/model.php
|
2022-02-18 07:25:15 +00:00 |
|
|
王怡栋
|
221aab879e
|
* adjust for task #49373.
|
2022-02-18 15:05:44 +08:00 |
|
|
孙广明
|
a453e3109e
|
Merge branch 'sprint/185_zhangzilong_49284' into sprint/185
|
2022-02-18 14:24:11 +08:00 |
|
|
孙广明
|
ffbbfe417f
|
Merge branch 'sprint/185' into 'sprint/185_zhangzilong_49284'
# Conflicts:
# db/update16.4.sql
|
2022-02-18 06:23:22 +00:00 |
|
|
zhangzilong
|
e56df2bc34
|
remove file.
|
2022-02-18 14:22:15 +08:00 |
|
|
zhangzilong
|
6dbeb7fe40
|
* Finish task #49284.
|
2022-02-18 14:17:20 +08:00 |
|
|
xieqiyu
|
4d3e06bce2
|
* Finish task#49308.
|
2022-02-18 14:04:20 +08:00 |
|
|
zhangzilong
|
fede832aa2
|
* Finish task #49284.
|
2022-02-18 14:00:53 +08:00 |
|
|
zhangzilong
|
504e7738b2
|
* Finish task #49284.
|
2022-02-18 13:56:17 +08:00 |
|
|
zhangzilong
|
0c4035711f
|
* Finish task #49284.
|
2022-02-18 13:15:48 +08:00 |
|
|
王怡栋
|
60937d3a52
|
Merge branch 'sprint/185_lwr_visionSwitch' into 'sprint/185'
Add vision switcher and tweak menu arrows.
See merge request easycorp/zentaopms!1842
|
2022-02-18 03:13:11 +00:00 |
|
|
王怡栋
|
116938b2e6
|
* finish task #49417.
|
2022-02-18 11:01:13 +08:00 |
|
|
李玉春
|
a618eea106
|
Merge branch 'Add_sql' into 'sprint/185'
*Add sql
See merge request easycorp/zentaopms!1845
|
2022-02-18 01:20:56 +00:00 |
|
|
zhengrunyu
|
45900728eb
|
*Add sql
|
2022-02-18 09:19:21 +08:00 |
|
|
孙广明
|
58212c71b7
|
Merge branch 'sprint/185_fixbug_wangyidong' into 'sprint/185'
* adjust for set vision.
See merge request easycorp/zentaopms!1844
|
2022-02-18 00:51:08 +00:00 |
|
|
王怡栋
|
3082abe478
|
* adjust for set vision.
|
2022-02-18 08:36:54 +08:00 |
|
|
zhangzilong
|
4e84e5cbd7
|
* Finish task #49284.
|
2022-02-17 17:35:11 +08:00 |
|
|
王怡栋
|
2eae8b3c38
|
Merge branch 'sprint/185_fixbug_lanzongjun_49422' into 'sprint/185'
* Fix bug #49422
See merge request easycorp/zentaopms!1843
|
2022-02-17 09:34:03 +00:00 |
|
|
Zongjun Lan
|
20732c0d2a
|
* Fix bug #49422
|
2022-02-17 17:32:12 +08:00 |
|
|
Zongjun Lan
|
41e878cf47
|
隐藏验收标准和影响范围
|
2022-02-17 17:22:48 +08:00 |
|
|
Wenrui LI
|
a02c9baf3d
|
* add vision switcher and tweak menu arrows.
|
2022-02-17 16:20:57 +08:00 |
|
|
王怡栋
|
218546e6c4
|
Merge branch 'sprint/tanghucheng_fixbug' into 'sprint/185'
* finish task #49421,49338.
See merge request easycorp/zentaopms!1838
|
2022-02-17 08:20:10 +00:00 |
|
|
tanghucheng
|
172443d36f
|
* Finish task #49342.
|
2022-02-17 16:07:54 +08:00 |
|
|
孙广明
|
3d519133fa
|
Merge branch 'sprint/185_xieqiyu_49292' into 'sprint/185'
* Finish task#49292.
See merge request easycorp/zentaopms!1835
|
2022-02-17 07:32:16 +00:00 |
|
|
孙广明
|
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 |
|
|
tanghucheng
|
966f00c07a
|
* finish task #49421,49338.
|
2022-02-17 14:58:59 +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 |
|
|
xieqiyu
|
70391990a0
|
* Finish task#49292.
|
2022-02-17 14:14:09 +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 |
|
|
zhengrunyu
|
ae58f6c7c8
|
* Finish task 49303.
|
2022-02-17 11:27:41 +08: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 |
|