chenbo
|
dd9a0b5b21
|
update
|
2023-10-25 14:22:55 +08:00 |
|
chenbo
|
6dd816c0b7
|
update 村联络员任务判定对接商城api统计接口
|
2023-10-25 10:53:59 +08:00 |
|
chenbo
|
9f1467ca3a
|
update 市场部长任务判定对接商城api统计接口
|
2023-10-25 10:49:38 +08:00 |
|
chenbo
|
6af8ff4f71
|
add 后台添加镇负责人任务模板
|
2023-10-25 09:46:19 +08:00 |
|
chenbo
|
02f1b63096
|
update
|
2023-10-24 14:26:19 +08:00 |
|
chenbo
|
f7dc74b3fc
|
add 商城商品列表
|
2023-10-24 13:43:35 +08:00 |
|
chenbo
|
d52a918109
|
add 商城列表
|
2023-10-24 11:23:20 +08:00 |
|
chenbo
|
6f1de215c1
|
add 村任务结算，分润,账户流水记录
|
2023-10-24 10:10:50 +08:00 |
|
chenbo
|
328aa375a9
|
fix 村公司任务6提交接口
add 村公司任务8提交接口，当天有临时任务的话，需要上传完成任务凭证，经后台审批通过后才发放
|
2023-10-24 10:04:32 +08:00 |
|
chenbo
|
8a0e4a0b4b
|
Merge remote-tracking branch 'origin/dev' into dev
|
2023-10-24 10:04:05 +08:00 |
|
chenbo
|
cda01503f7
|
fix 村公司任务6提交接口
add 村公司任务8提交接口，当天有临时任务的话，需要上传完成任务凭证，经后台审批通过后才发放
|
2023-10-24 10:03:49 +08:00 |
|
weiz
|
49d68f4eee
|
新增农户土地信息接口
|
2023-10-23 17:55:25 +08:00 |
|
chenbo
|
c73d2a7422
|
add 任务8自动结算
|
2023-10-23 17:53:14 +08:00 |
|
chenbo
|
73f79b6036
|
add 村联络员任务下发，结算判定，分润.无法自动判定的任务的提交和审批以及结算。
|
2023-10-23 17:31:01 +08:00 |
|
chenbo
|
3f164288ac
|
Merge remote-tracking branch 'origin/dev' into dev
|
2023-10-23 14:21:34 +08:00 |
|
chenbo
|
d9bcd0fa27
|
update 村管理公司任务-信息平台铺设提交接口
|
2023-10-23 14:18:05 +08:00 |
|
weiz
|
f6a207cb61
|
修改溯源系统请求供销系统农户信息的请求方式
|
2023-10-23 09:32:15 +08:00 |
|
weiz
|
332c7ed494
|
新增溯源系统调用的获取农户信息接口
|
2023-10-21 17:58:56 +08:00 |
|
weiz
|
e1d6aced4c
|
fixed
|
2023-10-21 13:56:01 +08:00 |
|
weiz
|
3c79f88de1
|
fixed
|
2023-10-21 13:51:09 +08:00 |
|
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 |
|