1899 Commits

Author SHA1 Message Date
chenbo
3b856cd25c 任务安排-添加任务时选择任务创建模板,自动填充表单 2023-12-18 16:23:55 +08:00
chenbo
7f3b99005c 任务安排-添加任务时选择任务创建模板,自动填充表单 2023-12-18 16:17:37 +08:00
chenbo
120e40c6e6 任务安排-添加任务时选择任务创建模板,自动填充表单 2023-12-18 16:10:23 +08:00
chenbo
7a3c482870 任务安排-添加任务时选择任务创建模板,自动填充表单 2023-12-18 15:54:21 +08:00
chenbo
5f3e46b4a2 任务安排-添加任务时选择任务创建模板,自动填充表单 2023-12-18 15:33:26 +08:00
chenbo
26c6108281 add 任务创建模板管理-前台代码 2023-12-18 15:12:04 +08:00
chenbo
a146eef523 add 任务创建模板管理-前台代码 2023-12-18 15:05:26 +08:00
chenbo
15eeb531d4 add 任务创建模板管理 2023-12-18 14:52:57 +08:00
chenbo
55512fc40f add 任务创建模板管理 2023-12-18 14:17:02 +08:00
mkm
b92e51c2e2 Merge pull request '管理员可看所有任务' (#184) from preview into master
Reviewed-on: #184
2023-12-18 10:58:29 +08:00
chenbo
456f77ece8 管理员可看所有任务 2023-12-18 10:57:42 +08:00
mkm
39b3e28e07 Merge pull request 'preview' (#183) from preview into master
Reviewed-on: #183
2023-12-18 10:52:02 +08:00
chenbo
247500c10d Merge branch 'dev' into preview 2023-12-18 10:51:23 +08:00
chenbo
8354517e9c 管理员可看所有任务 2023-12-18 10:50:59 +08:00
mkm
319691ae73 Merge pull request 'preview' (#182) from preview into master
Reviewed-on: #182
2023-12-18 10:47:22 +08:00
chenbo
02a59a82e0 Merge branch 'dev' into preview 2023-12-18 10:46:18 +08:00
chenbo
9f8e86b932 fixed后台镇合伙人管理员角色 2023-12-18 10:45:50 +08:00
chenbo
baf70cbf46 Merge remote-tracking branch 'origin/dev' into dev 2023-12-18 10:18:30 +08:00
chenbo
2b309ced64 fixed后台镇合伙人管理员角色 2023-12-18 10:18:21 +08:00
mkm
13199b51a0 Merge pull request 'preview' (#181) from preview into master
Reviewed-on: #181
2023-12-16 18:40:14 +08:00
chenbo
4b7b43a1d1 Merge pull request 'mysql断线重连,解决队列或者定时任务类长时间操作数据库的场景' (#180) from dev into preview
Reviewed-on: #180
2023-12-16 16:56:33 +08:00
chan
e9c86f43cc mysql断线重连,解决队列或者定时任务类长时间操作数据库的场景 2023-12-16 16:54:09 +08:00
chenbo
448d1a301a app未授权友好提示 2023-12-15 10:10:13 +08:00
mkm
3f307fff4b Merge pull request 'preview' (#179) from preview into master
Reviewed-on: #179
2023-12-14 14:10:07 +08:00
chenbo
eecc48ad9a 前端文件 2023-12-14 13:34:33 +08:00
chenbo
44ae2a7487 Merge remote-tracking branch 'origin/dev' into dev 2023-12-14 11:56:46 +08:00
chenbo
083e39cad3 fixed 2023-12-14 11:56:34 +08:00
chan
f77339f949 校验角色是否存在 2023-12-11 15:14:43 +08:00
chan
8ccaecceb9 镇合伙人任务添加校验公司是否存在任务角色用户 2023-12-11 14:23:46 +08:00
chenbo
5f1675abf4 fixed 2023-12-09 17:16:36 +08:00
mkm
ecd3e5d009 Merge pull request 'preview' (#178) from preview into master
Reviewed-on: #178
2023-12-05 10:29:44 +08:00
chenbo
ebdfc81b16 fixed 村联络员任务-种养殖基地订单匹配 改为每日结算。新增log,记录请求商城接口返回情况。 2023-12-05 10:20:27 +08:00
chenbo
5aca95ef79 删除 提供商城查询三轮车列表接口 2023-12-04 15:54:45 +08:00
chenbo
9b534e6c32 fixed 2023-12-04 15:41:22 +08:00
chenbo
066e8c4382 fixed 2023-12-04 13:42:17 +08:00
chenbo
91e77b712c 提供商城查询三轮车列表接口 2023-12-02 19:53:38 +08:00
mkm
369478622c Merge remote-tracking branch 'origin/preview' 2023-11-30 12:46:18 +08:00
chenbo
7783254f1a 充值记录列表倒序排列 2023-11-30 12:41:36 +08:00
chenbo
b0058752d4 debug 充值回调 2023-11-30 12:37:40 +08:00
chenbo
d2667977f9 Revert "add 供销对接支付系统"
This reverts commit 04d478d8
2023-11-30 12:14:16 +08:00
chenbo
2f99915481 update 镇农科公司任务结算接口改为镇合伙人公司任务结算 2023-11-29 10:26:35 +08:00
chenbo
99b3c18a8e fixed 需要手动提交的任务,不需要修改任务指定人,在任务下发时已确定。 2023-11-28 10:58:32 +08:00
chenbo
89ce6e2281 fixed 修改之前关于镇农科公司任务的描述,全部改为镇合伙人 2023-11-28 10:15:25 +08:00
chenbo
cdb46846a4 fixed 镇合伙人公司任务审批 2023-11-28 09:59:28 +08:00
yaooo
ddfcb98b60 Merge branch 'dev' of https://gitea.lihaink.cn/mkm/TaskSystem into dev 2023-11-27 10:25:53 +08:00
yaooo
97c885e249 更新统计 2023-11-27 10:25:40 +08:00
chenbo
16423d0185 fixed 编辑入股任务回显 2023-11-25 16:10:19 +08:00
weiz
d54aa707aa Merge pull request 'update' (#175) from zhangwei into dev
Reviewed-on: #175
2023-11-25 14:34:25 +08:00
weiz
8ac05f8fa3 update 2023-11-25 14:33:41 +08:00
chenbo
995ede0dff update 更新前端代码 2023-11-25 10:20:13 +08:00