1157 Commits

Author SHA1 Message Date
weiz
0eb6d8607d fixed 2023-10-21 11:56:43 +08:00
chenbo
96ce4310e4 update 小组团第任务-其他任务可重复创建 2023-10-21 11:39:39 +08:00
chenbo
6ee37ae389 update 梳理公司余额,股金,押金三类金额的流水记录。 2023-10-21 10:40:41 +08:00
chenbo
8da2085806 update 梳理公司余额,股金,押金三类金额的流水记录。 2023-10-21 10:37:57 +08:00
chenbo
ff602c7d6b Merge remote-tracking branch 'origin/master-yajin-feature' into dev
# Conflicts:
#	public/admin/index.html
2023-10-21 10:18:51 +08:00
yaooo
98dd3970e7 Merge branch 'dev' of https://gitea.lihaink.cn/mkm/TaskSystem into dev 2023-10-21 09:32:18 +08:00
yaooo
d2fa4826cc 更新ocr 2023-10-21 09:28:35 +08:00
weiz
45419c7c35 test 2023-10-20 20:18:21 +08:00
chenbo
c731fa3976 Merge remote-tracking branch 'origin/dev' into dev 2023-10-20 17:48:16 +08:00
chenbo
4ca0700e96 fixed:任务审批列表 2023-10-20 17:48:05 +08:00
weiz
2183507283 Merge pull request 'fixed workerman ip' (#134) from zhangwei into dev
Reviewed-on: #134
2023-10-20 17:47:55 +08:00
weiz
0f2c0e0982 fixed workerman ip 2023-10-20 17:47:22 +08:00
weiz
83ccb3ae92 Merge pull request 'fixed register ip' (#133) from zhangwei into dev
Reviewed-on: #133
2023-10-20 17:42:18 +08:00
weiz
9d24f39dfa fixed register ip 2023-10-20 17:41:55 +08:00
weiz
406a8555e0 Merge pull request 'fixed register ip' (#132) from zhangwei into dev
Reviewed-on: #132
2023-10-20 17:34:58 +08:00
weiz
6144dea271 fixed register ip 2023-10-20 17:34:34 +08:00
weiz
a652dd2a54 Merge pull request 'fixed register ip' (#131) from zhangwei into dev
Reviewed-on: #131
2023-10-20 17:29:17 +08:00
weiz
e66e0d1a68 fixed register ip 2023-10-20 17:28:41 +08:00
yaooo
1bc49b39fa Merge branch 'dev' of https://gitea.lihaink.cn/mkm/TaskSystem into dev 2023-10-20 17:23:21 +08:00
yaooo
d89974dd51 更新question 2023-10-20 17:23:13 +08:00
chenbo
5c1273ba4c fixed:其他任务提交和审批 2023-10-20 16:38:16 +08:00
chenbo
85cc16a8cd update:小组服务公司管理员可查看公司所有任务 2023-10-20 15:41:52 +08:00
chenbo
60defd526b Merge remote-tracking branch 'origin/dev' into dev 2023-10-20 10:47:03 +08:00
chenbo
18c7338903 update:任务审批联调-市场部长数字农贸宣传业务、加工业务的建设和招商工作 2023-10-20 10:46:50 +08:00
yaooo
a000ab203c 更新ocr识别接口 2023-10-19 18:16:11 +08:00
yaooo
9f1c440ab7 更新ocr识别接口 2023-10-19 18:08:14 +08:00
yaooo
d5c109e0a4 Merge branch 'dev' of https://gitea.lihaink.cn/mkm/TaskSystem into dev 2023-10-19 17:36:46 +08:00
yaooo
75c7cd4d6b 更新ocr识别接口 2023-10-19 17:36:22 +08:00
chenbo
9049b0784f update:任务提交-市场部长数字农贸宣传业务、加工业务的建设和招商工作详情接口 2023-10-19 17:32:11 +08:00
chenbo
e44c0c202d update:任务提交-市场部长数字农贸宣传业务、加工业务的建设和招商工作详情接口 2023-10-19 17:12:27 +08:00
chenbo
fb92e4106a update:任务提交-市场部长数字农贸宣传业务、加工业务的建设和招商工作详情接口 2023-10-19 17:01:51 +08:00
chenbo
2fb707edad Merge remote-tracking branch 'origin/dev' into dev 2023-10-19 16:03:13 +08:00
chenbo
b13b8eceef add:任务审批-市场部长数字农贸宣传业务、加工业务的建设和招商工作 2023-10-19 16:03:01 +08:00
weiz
4339b0265e update 2023-10-19 14:15:02 +08:00
weiz
cd407fe401 update 2023-10-19 11:57:38 +08:00
chenbo
edd8d051f9 Merge remote-tracking branch 'origin/dev' into dev 2023-10-19 10:59:28 +08:00
chenbo
bd248fc2cb add:任务审批-市场部长数字农贸宣传业务、加工业务的建设和招商工作 2023-10-19 10:59:19 +08:00
weiz
a537f98180 修复重新发送合同bug 2023-10-19 10:53:03 +08:00
chenbo
8b56240eaa Merge remote-tracking branch 'origin/dev' into dev 2023-10-19 10:49:15 +08:00
chenbo
5b48be926e add:存管理公司后台任务模板添加,任务下发 2023-10-19 10:49:03 +08:00
weiz
43802d4b23 购买车辆数量bug修复 2023-10-19 10:10:17 +08:00
chenbo
ad93d3f05c fixed 任务提交 2023-10-19 09:47:37 +08:00
chenbo
170bf379ae fixed 任务提交 2023-10-19 09:45:59 +08:00
chenbo
8fb9aeddbe 任务10 提交接口 2023-10-18 18:24:11 +08:00
chenbo
a85a59cbd9 任务10 提交接口 2023-10-18 18:20:49 +08:00
chenbo
9dde757e8a Merge remote-tracking branch 'origin/dev' into dev 2023-10-18 18:11:05 +08:00
chenbo
a9b62cbdd6 fixed 2023-10-18 18:10:53 +08:00
unknown
0ca38971e0 update 2023-10-18 18:09:41 +08:00
chenbo
3dba51a7b3 Merge remote-tracking branch 'origin/dev' into dev 2023-10-18 18:01:56 +08:00
chenbo
f3467e9dd8 add:任务10提交接口,新增说明字段 2023-10-18 18:00:21 +08:00