hufangzhou
|
8011a9dc0e
|
* Fix sql.
|
2022-03-17 10:05:40 +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 |
|
孙广明
|
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 |
|
孙广明
|
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 |
|
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
|
e91c1acbb7
|
* Modify the default value of visions field.
|
2022-03-13 19:31:51 +08:00 |
|
tanghucheng
|
477e89a09e
|
* Fix bug.
|
2022-03-11 14:03:30 +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 |
|
tianshujie
|
2629c804dc
|
* Change the upgrade program to SQL.
|
2022-03-10 08:55:36 +08:00 |
|
王怡栋
|
a783b5d736
|
Merge branch 'master' into 'sprint/master_tanghucheng_fix'
# Conflicts:
# db/update16.4.sql
# module/user/view/batchcreate.html.php
|
2022-03-07 05:25:38 +00:00 |
|
tanghucheng
|
79a38cc9ad
|
* Fix bug.
|
2022-03-07 13:04:06 +08:00 |
|
zhouxin
|
5dc91f9a30
|
Finish task #49886#49883.
|
2022-02-28 09:14:19 +00:00 |
|
hufangzhou
|
bc89a1051d
|
* Rewrite the Makefile.
|
2022-02-24 16:17:25 +08:00 |
|
李玉春
|
9405f7bf71
|
Merge branch 'sprint/185' into 'sprint/185_zhengrunyu_49283'
# Conflicts:
# db/update16.4.sql
# module/user/view/story.html.php
|
2022-02-23 01:33:37 +00: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
|
0c4035711f
|
* Finish task #49284.
|
2022-02-18 13:15:48 +08:00 |
|
zhengrunyu
|
22f29fd8d4
|
*Fix bug 49283
|
2022-02-18 10:40:09 +08:00 |
|
zhengrunyu
|
45900728eb
|
*Add sql
|
2022-02-18 09:19:21 +08:00 |
|
zhangzilong
|
4e84e5cbd7
|
* Finish task #49284.
|
2022-02-17 17:35:11 +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 |
|
zhengrunyu
|
56b22d9b83
|
* Add sql
|
2022-02-17 14:35:30 +08:00 |
|
Wenrui LI
|
4ec144c99e
|
* fix bad merge.
|
2022-02-17 10:42:11 +08:00 |
|
zhujinyong
|
d02ddc138c
|
Merge branch 'lite' into sprint/185
|
2022-02-17 10:20:50 +08:00 |
|
zhujinyong
|
5bd64d9312
|
Merge branch 'lite' into sprint/185
|
2022-02-17 08:56:40 +08:00 |
|