 王怡栋
|
1df620e923
|
Merge branch 'sprint/daitingting_product_printextendfield' into 'master'
* Fix bug for printExtendFields in view file.
See merge request easycorp/zentaopms!3387
|
2022-05-13 03:24:53 +00:00 |
|
|
wangyidong
|
d5e9bf9dc9
|
Merge branch 'fixbug'
|
2022-05-13 11:23:34 +08:00 |
|
|
王怡栋
|
77d9a77af8
|
Merge branch 'master' into 'fixbug'
# Conflicts:
# db/update16.5.sql
|
2022-05-13 03:21:53 +00:00 |
|
|
tanghucheng
|
da9ec2cff1
|
* Fix bug.
|
2022-05-13 03:18:32 +00:00 |
|
|
tanghucheng
|
8ae4c1bcd0
|
* Fix bug.
|
2022-05-13 03:15:40 +00:00 |
|
|
daitingting
|
137b6e6417
|
* Fix bug for printExtendFields in view file.
|
2022-05-13 03:10:08 +00:00 |
|
|
tanghucheng
|
4cf1825350
|
* Fix bug.
|
2022-05-13 03:03:33 +00:00 |
|
|
孙广明
|
a6c88dc747
|
Merge branch 'sprint/unittest_liumengyi_block' into 'master'
* Add unit test of block.
See merge request easycorp/zentaopms!3385
|
2022-05-13 02:54:47 +00:00 |
|
|
liumengyi
|
731ce65bcf
|
* Add unit test of block.
|
2022-05-13 10:51:22 +08:00 |
|
|
王怡栋
|
ce0f556d48
|
Merge branch 'master_xieqiyu_53666' into 'master'
Master xieqiyu 53666
See merge request easycorp/zentaopms!3384
|
2022-05-13 02:48:26 +00:00 |
|
|
孙广明
|
e427da87d5
|
Merge branch 'sprint/189_mayue_fixbug#22411' into 'master'
* Fix bug #22411.
See merge request easycorp/zentaopms!3383
|
2022-05-13 02:36:02 +00:00 |
|
|
mayue
|
2bbc219944
|
* Fix bug #22411.
|
2022-05-13 02:33:54 +00:00 |
|
|
wangyidong
|
c1b12a1104
|
* code bug #22445.
|
2022-05-13 10:22:02 +08:00 |
|
|
wangyidong
|
0a9dca7902
|
* code bug #22442.
|
2022-05-13 10:11:36 +08:00 |
|
|
wangyidong
|
9e49476c2f
|
* code bug #22447.
|
2022-05-13 10:07:00 +08:00 |
|
|
孙广明
|
10a542cc35
|
Merge branch 'sprint/189_zenggang' into 'master'
* Fix bugs
See merge request easycorp/zentaopms!3374
|
2022-05-13 01:57:36 +00:00 |
|
|
wangyidong
|
0e1859becf
|
* code bug #22440.
|
2022-05-13 09:57:06 +08:00 |
|
|
王怡栋
|
f82384a4cd
|
Merge branch 'sprint/189_hufangzhou_22439' into 'master'
* Fix bug #22439.
See merge request easycorp/zentaopms!3382
|
2022-05-13 01:44:23 +00:00 |
|
|
王怡栋
|
71354563ea
|
Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'
* add method sql
See merge request easycorp/zentaopms!3378
|
2022-05-13 01:43:40 +00:00 |
|
|
hufangzhou
|
b9a60485c3
|
* Fix bug #22439.
|
2022-05-13 09:33:37 +08:00 |
|
|
lanzongjun
|
3cf3682e41
|
* modify error sql
|
2022-05-13 09:27:12 +08:00 |
|
|
lanzongjun
|
7f93dcd1c4
|
* add method sql
|
2022-05-13 09:23:00 +08:00 |
|
|
王怡栋
|
19f37df962
|
Merge branch 'fixbug' into 'master'
* Fix bug.
See merge request easycorp/zentaopms!3381
|
2022-05-13 01:16:18 +00:00 |
|
|
王怡栋
|
86f2e56096
|
Merge branch 'sprint/master_zhouxudong_compile' into 'master'
Sprint/master zhouxudong compile
See merge request easycorp/zentaopms!3355
|
2022-05-13 01:15:40 +00:00 |
|
|
tanghucheng
|
5a5f691b37
|
* Fix bug.
|
2022-05-13 01:15:30 +00:00 |
|
|
王怡栋
|
24c8d5f010
|
Merge branch 'sprint/189_hufangzhou_22407' into 'master'
* Fix bug #22407.
See merge request easycorp/zentaopms!3377
|
2022-05-13 01:14:26 +00:00 |
|
|
zhouxudong
|
b15b2cc0f5
|
* Fix a error.
|
2022-05-13 01:13:30 +00:00 |
|
|
王怡栋
|
b885f105d2
|
Merge branch 'sprint/189_hufangzhou_22443' into 'master'
* Fix bug #22443.
See merge request easycorp/zentaopms!3380
|
2022-05-13 01:04:12 +00:00 |
|
|
zhouxudong
|
4d84d1c84b
|
* Deleted space.
|
2022-05-13 01:03:46 +00:00 |
|
|
hufangzhou
|
74bf099c98
|
* Fix bug #22443.
|
2022-05-13 09:02:56 +08:00 |
|
|
李玉春
|
5b90338ebb
|
Merge branch 'sprint/tianshujie_bug22437' into 'master'
* Fix bug #22437.
See merge request easycorp/zentaopms!3379
|
2022-05-13 00:59:11 +00:00 |
|
|
zhouxudong
|
c3c455beb5
|
* Add compile auto test.
|
2022-05-13 00:58:09 +00:00 |
|
|
zhouxudong
|
0bf0035780
|
* Add compile auto test.
|
2022-05-13 00:55:36 +00:00 |
|
|
zhouxudong
|
ffc0cffc90
|
* Add compile auto test.
|
2022-05-13 00:52:55 +00:00 |
|
|
lanzongjun
|
4a5c3a2f0e
|
* add method sql
|
2022-05-13 08:48:19 +08:00 |
|
|
hufangzhou
|
401ea2f810
|
* Fix bug #22407.
|
2022-05-13 08:47:46 +08:00 |
|
|
wangyidong
|
ee559e5e7c
|
* code for bug #22376.
|
2022-05-13 08:47:42 +08:00 |
|
|
zenggang
|
94bf6a70a2
|
* Adjust code
|
2022-05-13 00:44:07 +00:00 |
|
|
tianshujie
|
6770b72b11
|
* Fix bug #22437.
|
2022-05-13 08:42:26 +08:00 |
|
|
wangyidong
|
71bc27b631
|
* fix bug #22433.
|
2022-05-13 08:27:44 +08:00 |
|
|
xieqiyu
|
f5210e857b
|
* Code for task#53666.
|
2022-05-12 23:27:00 +08:00 |
|
|
xieqiyu
|
914f474592
|
* Code for task#53666.
|
2022-05-12 22:58:17 +08:00 |
|
|
wangyidong
|
50ec57b390
|
* code for story #32387.
|
2022-05-12 19:04:44 +08:00 |
|
|
wangyidong
|
7336b0dabb
|
* code for task #53928.
|
2022-05-12 18:56:26 +08:00 |
|
|
王怡栋
|
3f6d438550
|
Merge branch 'sprint/189_liumengyi_kanban' into 'master'
* Add card desc of productplan card and build card.
See merge request easycorp/zentaopms!3376
|
2022-05-12 09:24:21 +00:00 |
|
|
liumengyi
|
b3fd6f4f53
|
* Add card desc of productplan card and build card.
|
2022-05-12 17:22:10 +08:00 |
|
|
王怡栋
|
c116f9a9d1
|
Merge branch 'fixbug' into 'master'
* Fix bug.
See merge request easycorp/zentaopms!3372
|
2022-05-12 09:10:50 +00:00 |
|
|
wangyidong
|
c1cb8211dc
|
Merge branch 'sprint/master_lanzongjun_fixbug'
|
2022-05-12 17:09:47 +08:00 |
|
|
王怡栋
|
a47a3ad064
|
Merge branch 'master' into 'sprint/master_lanzongjun_fixbug'
# Conflicts:
# db/update16.5.sql
|
2022-05-12 09:09:28 +00:00 |
|
|
lanzongjun
|
24a67405db
|
* add sql
|
2022-05-12 17:07:58 +08:00 |
|