 hufangzhou
|
11e151a6fa
|
* Add the new version.
|
2022-03-24 10:48:05 +08:00 |
|
|
李玉春
|
e59d22f222
|
Merge branch 'mayue_fix_bug#20645' into 'master'
* Fix bug #20645.
See merge request easycorp/zentaopms!2427
|
2022-03-22 02:51:35 +00:00 |
|
|
王怡栋
|
fe91dc8481
|
Merge branch 'pailei2'
|
2022-03-22 09:01:03 +08:00 |
|
|
liyuchun
|
0187fb80c7
|
Merge branch 'devops24'
|
2022-03-22 08:28:32 +08:00 |
|
|
tanghucheng
|
3bda7c38aa
|
* Fix bug for upgrade.
|
2022-03-21 16:07:03 +08:00 |
|
|
zenggang
|
70d00fad9e
|
* Code for task#50697,50685
|
2022-03-17 03:07:38 +00:00 |
|
|
hufangzhou
|
8011a9dc0e
|
* Fix sql.
|
2022-03-17 10:05:40 +08:00 |
|
|
zhujinyong
|
56c0ef9064
|
* Fix sql.
|
2022-03-16 13:38:33 +08:00 |
|
|
孙广明
|
4cc13f3b13
|
Merge branch 'pailei2_mayue_bug#17576' into 'pailei2'
* Revert code.
See merge request easycorp/zentaopms!2296
|
2022-03-16 05:10:42 +00:00 |
|
|
mayue
|
bff6607776
|
* Revert code.
|
2022-03-16 13:05:31 +08:00 |
|
|
zhujinyong
|
489be02f3f
|
* Fix review.
|
2022-03-16 12:11:09 +08:00 |
|
|
tanghucheng
|
b9542612cb
|
* Fix bug.
|
2022-03-16 09:51:36 +08:00 |
|
|
孙广明
|
c498c964ba
|
* Change version.
|
2022-03-16 08:35:21 +08:00 |
|
|
李玉春
|
e700b4414a
|
Merge branch 'pailei2_mayue_bug#17576' into 'pailei2'
* Fix bug #17576.
See merge request easycorp/zentaopms!2279
|
2022-03-15 09:15:40 +00:00 |
|
|
王怡栋
|
78de67f523
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms
|
2022-03-15 14:31:51 +08:00 |
|
|
王怡栋
|
9ffa55da56
|
* fix bug #20682.
|
2022-03-15 14:31:01 +08:00 |
|
|
mayue
|
405e26a93d
|
* Fix bug #17576.
|
2022-03-15 13:39:16 +08:00 |
|
|
孙广明
|
fa3c92e03f
|
Merge branch 'master' into 'sprint/master_tanghucheng_fix'
# Conflicts:
# db/update16.4.sql
|
2022-03-15 05:13:52 +00:00 |
|
|
tanghucheng
|
771cde761c
|
* Fix bug #20757.
|
2022-03-15 13:09:24 +08:00 |
|
|
zhujinyong
|
841897faca
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms
|
2022-03-15 12:24:24 +08:00 |
|
|
zhujinyong
|
28c73c8ec6
|
* Fix error of task api.
|
2022-03-15 12:23:57 +08:00 |
|
|
xieqiyu
|
6188802ae4
|
* Fix bug#20111.
|
2022-03-15 11:08:48 +08:00 |
|
|
孙广明
|
71f49f171f
|
Merge branch 'sprint/master_tanghucheng_fixbug' into 'master'
* Fix bug.
See merge request easycorp/zentaopms!2246
|
2022-03-14 09:10:18 +00:00 |
|
|
tanghucheng
|
64f44170e5
|
* Fix bug.
|
2022-03-14 16:58:34 +08:00 |
|
|
孙广明
|
37153ad060
|
* Fix bug #20725
|
2022-03-14 16:34:49 +08:00 |
|
|
mayue
|
5c3395ee46
|
* Fix bug #20645.
|
2022-03-14 16:17:51 +08:00 |
|
|
zhujinyong
|
976299d506
|
* Fix type of fields.
|
2022-03-14 15:12:32 +08:00 |
|
|
朱金勇
|
0ba0e25d66
|
Merge branch 'sgm_upgrade' into 'master'
* Fix upgrade bug.
See merge request easycorp/zentaopms!2230
|
2022-03-14 06:36:24 +00:00 |
|
|
孙广明
|
140c7652ad
|
* Fix upgrade bug.
|
2022-03-14 14:23:19 +08:00 |
|
|
孙广明
|
16bfad8acd
|
Merge branch 'sprint/master_tanghucheng_fixbug' into 'master'
* Fix bug for priv.
See merge request easycorp/zentaopms!2226
|
2022-03-14 03:31:17 +00:00 |
|
|
tanghucheng
|
4cbe8ae9a2
|
* Fix bug for priv.
|
2022-03-14 11:23:55 +08:00 |
|
|
hufangzhou
|
9a3d7b3a1f
|
* Add the functions to zentao.sql .
|
2022-03-13 22:30:12 +08:00 |
|
|
hufangzhou
|
e91c1acbb7
|
* Modify the default value of visions field.
|
2022-03-13 19:31:51 +08:00 |
|
|
孙广明
|
8b1c98b575
|
Merge branch 'sprint/master_tanghucheng_fixbug' into 'master'
* Fix sql for lite grouppriv.
See merge request easycorp/zentaopms!2205
|
2022-03-11 07:24:33 +00:00 |
|
|
孙广明
|
a541af7376
|
更新db/zentao.sql
|
2022-03-11 07:24:09 +00:00 |
|
|
tanghucheng
|
2cfd68b216
|
* Fix sql for lite grouppriv.
|
2022-03-11 14:28:42 +08:00 |
|
|
hufangzhou
|
2d88fc4785
|
* Remove the unused code.
|
2022-03-11 14:16:30 +08:00 |
|
|
tanghucheng
|
b164bc829b
|
* Fix sql for lite grouppriv.
|
2022-03-11 14:15:44 +08:00 |
|
|
孙广明
|
63786c575d
|
Merge branch 'sprint/master_tanghucheng_fixbug' into 'master'
* Fix bug.
See merge request easycorp/zentaopms!2204
|
2022-03-11 06:08:38 +00:00 |
|
|
tanghucheng
|
477e89a09e
|
* Fix bug.
|
2022-03-11 14:03:30 +08:00 |
|
|
王怡栋
|
7f8d7c6593
|
* fix bug #20490.
|
2022-03-11 10:26:33 +08:00 |
|
|
zhujinyong
|
f32ff3980b
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms
|
2022-03-10 16:22:58 +08:00 |
|
|
zhujinyong
|
819fad539e
|
* Finish story#31282, story#31284.
|
2022-03-10 16:21:27 +08:00 |
|
|
孙广明
|
97859c945b
|
Merge branch 'master' into 'sprint/master_tanghucheng_fixbug'
# Conflicts:
# module/user/js/batchcreate.js
# module/user/view/batchcreate.html.php
|
2022-03-10 08:07:31 +00:00 |
|
|
朱金勇
|
9fb53de457
|
Merge branch 'sgm_upgrade' into 'master'
Sgm upgrade
See merge request easycorp/zentaopms!2177
|
2022-03-10 02:30:28 +00:00 |
|
|
sgm0422
|
1748b61779
|
* Fix upgrade error.
|
2022-03-10 10:01:08 +08:00 |
|
|
tianshujie
|
2629c804dc
|
* Change the upgrade program to SQL.
|
2022-03-10 08:55:36 +08:00 |
|
|
tanghucheng
|
b4726315ba
|
* Fix bug.
|
2022-03-09 17:27:01 +08:00 |
|
|
孙广明
|
33fc87131e
|
* Add pro/biz/max sql to open.
|
2022-03-08 08:55:16 +08:00 |
|
|
hufangzhou
|
50d99f6e02
|
* Adjust the sql.
|
2022-03-07 15:12:11 +08:00 |
|