 zenggang
|
e1307f1dc7
|
* Adjust code
|
2022-05-16 00:36:40 +00:00 |
|
|
zenggang
|
3dc56ad3e2
|
* Program getlist method unit
|
2022-05-13 09:23:46 +00:00 |
|
|
孙广明
|
80d4d784af
|
Merge branch 'sprint/scx_closefeedback' into 'master'
* Fix bug #22261.
See merge request easycorp/zentaopms!3375
|
2022-05-13 08:24:11 +00:00 |
|
|
孙广明
|
0474789c6b
|
Merge branch 'mayue_fix_apibug' into 'master'
* Fix api bug.
See merge request easycorp/zentaopms!3400
|
2022-05-13 08:23:49 +00:00 |
|
|
mayue
|
025238c3d8
|
* Fix api bug.
|
2022-05-13 08:17:12 +00:00 |
|
|
孙广明
|
a7f317c6e2
|
Merge branch 'sprint/unittest_liumengyi_block' into 'master'
* Add unit test of block save.
See merge request easycorp/zentaopms!3399
|
2022-05-13 06:54:24 +00:00 |
|
|
liumengyi
|
ebf8b3cbd8
|
* Add init of save().
|
2022-05-13 14:53:29 +08:00 |
|
|
liumengyi
|
f6084050ae
|
* Add unit test of block save.
|
2022-05-13 14:50:58 +08:00 |
|
|
王怡栋
|
1927af786c
|
Merge branch 'master_xieqiyu_unittest' into 'master'
Master xieqiyu unittest
See merge request easycorp/zentaopms!3395
|
2022-05-13 06:40:09 +00:00 |
|
|
李玉春
|
a3c63501f9
|
Merge branch 'sprint/tianshujie_fixbug' into 'master'
* Fix bug #22483.
See merge request easycorp/zentaopms!3396
|
2022-05-13 06:30:08 +00:00 |
|
|
孙广明
|
4d3cff9962
|
Merge branch 'sprint/189_mayue_fixbug#22412' into 'master'
* Fix bug #22412.
See merge request easycorp/zentaopms!3394
|
2022-05-13 06:25:31 +00:00 |
|
|
mayue
|
156ebf701f
|
* Optimize code.
|
2022-05-13 06:22:39 +00:00 |
|
|
wangyidong
|
12b811e4b4
|
* adjust for workflow field.
|
2022-05-13 14:19:54 +08:00 |
|
|
tianshujie
|
eb7b7d92c4
|
* Fix bug #22483.
|
2022-05-13 14:17:13 +08:00 |
|
|
mayue
|
3581e32357
|
* Fix bug #22412.
|
2022-05-13 06:14:05 +00:00 |
|
|
李玉春
|
9771a318d5
|
Merge branch 'fix_bug' into 'master'
Fix bug
See merge request easycorp/zentaopms!3391
|
2022-05-13 05:19:58 +00:00 |
|
|
孙华伟
|
12b8250e06
|
*Fix bug #22453 #22455.
|
2022-05-13 13:17:10 +08:00 |
|
|
王怡栋
|
def7e0a5ed
|
Merge branch 'sprint/189_hufangzhou_autotest' into 'master'
* Add the auto test case for action model.
See merge request easycorp/zentaopms!3388
|
2022-05-13 03:34:22 +00:00 |
|
|
王怡栋
|
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 |
|
|
hufangzhou
|
0e6c1e24b3
|
* Add the auto test case for action model.
|
2022-05-13 11:17:32 +08:00 |
|
|
孙华伟
|
8ab8962a3f
|
*Fix bug#22453
|
2022-05-13 11:16:52 +08: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 |
|
|
孙华伟
|
183da95a35
|
*Fix bug#22454
|
2022-05-13 11:07:54 +08: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 |
|