田淑杰 f6d750c01a Merge branch 'master' into 'sprint/247_tianshujie_table' ...

# Conflicts:
#   module/my/view/task.html.php
#   www/theme/default/style.css

2022-10-10 08:43:18 +00:00

..

css

Merge branch 'master' into 'sprint/247_tianshujie_table'

2022-10-10 08:43:18 +00:00

js

Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/244_wzm_70007

2022-10-09 15:19:48 +08:00

lang

* Modify language.

2022-10-10 11:05:49 +08:00

view

Merge branch 'master' into 'sprint/247_tianshujie_table'

2022-10-10 08:43:18 +00:00

config.php

* finish task *71875

2022-10-10 02:51:03 +00:00

control.php

* Finish task #71886.

2022-10-09 09:36:13 +08:00

model.php

* Modify execution page style.

2022-10-10 10:33:40 +08:00