1156 Commits

Author SHA1 Message Date
mkm
3034eaf5b1 更新 2023-09-25 22:04:03 +08:00
mkm
b358dfe299 修复 2023-09-25 22:00:21 +08:00
mkm
285554a8ba 更新 2023-09-25 21:58:23 +08:00
mkm
f0d4d0589e 更新 2023-09-25 21:34:14 +08:00
mkm
f83ff91c64 Merge pull request 'preview' (#41) from preview into master
Reviewed-on: #41
2023-09-25 19:26:43 +08:00
mkm
eff3d94cc3 Merge pull request 'dev' (#40) from dev into preview
Reviewed-on: #40
2023-09-25 19:26:27 +08:00
mkm
0f9d69f1d0 更新 2023-09-25 19:25:59 +08:00
chenbo
4e296b792d 修改代码中关于镇农科公司的描述 2023-09-25 19:11:50 +08:00
chenbo
7369b477d7 41 镇农科公司 2023-09-25 18:57:52 +08:00
chenbo
adb53a2840 debug 发送短信 2023-09-25 18:25:10 +08:00
mkm
e3b189b1cc Merge pull request 'preview' (#39) from preview into master
Reviewed-on: #39
2023-09-25 18:09:08 +08:00
mkm
2ef858608e Merge pull request 'dev' (#38) from dev into preview
Reviewed-on: #38
2023-09-25 18:08:43 +08:00
chenbo
2cefddba52 Merge remote-tracking branch 'origin/dev' into dev 2023-09-25 16:46:06 +08:00
chenbo
df1b8ad0fb fixed 2023-09-25 16:45:57 +08:00
mkm
c3cea3b8ec Merge pull request '更新 app/api/controller/CompanyController.php' (#37) from preview into master
Reviewed-on: #37
2023-09-25 16:11:24 +08:00
mkm
876aa66048 更新 app/api/controller/CompanyController.php
更新
2023-09-25 16:05:27 +08:00
mkm
8d439540b6 跟新 2023-09-25 16:04:45 +08:00
mkm
ad0d3a3cd8 Merge pull request '更新 app/api/controller/CompanyController.php' (#36) from preview into master
Reviewed-on: #36
2023-09-25 14:53:57 +08:00
mkm
88b79bfef6 更新 app/api/controller/CompanyController.php
修复镇查询
2023-09-25 14:46:29 +08:00
mkm
6f3f36f87b 修复管理公司查询 2023-09-25 14:44:27 +08:00
chenbo
3a3e5294f2 其他任务审批列表过滤 2023-09-25 14:10:39 +08:00
chenbo
2c2296db20 投诉反馈 2023-09-25 12:00:17 +08:00
chenbo
88ebf59278 前端打包代码 2023-09-25 11:50:08 +08:00
chenbo
814bc8f60d 余额列表-公司用户列表接口 2023-09-25 11:26:21 +08:00
chenbo
9574741088 Merge remote-tracking branch 'origin/dev' into dev 2023-09-25 10:28:09 +08:00
chenbo
3a0b20e5aa fixed 2023-09-25 10:27:56 +08:00
shengchanzhe
d1d2e38e84 Merge branch 'preview' of https://gitea.lihaink.cn/mkm/TaskSystem 2023-09-25 00:35:26 +08:00
mkm
17fadf9910 Merge pull request 'dev' (#34) from dev into preview
Reviewed-on: #34
2023-09-24 19:32:52 +08:00
mkm
4dec31a0d9 更新 app/api/controller/CompanyController.php
修复code
2023-09-24 19:29:02 +08:00
mkm
75bbfedc89 修复权限 2023-09-23 19:11:44 +08:00
mkm
b2d9183891 Merge branch 'dev' of https://gitea.lihaink.cn/mkm/TaskSystem into dev 2023-09-23 18:59:02 +08:00
mkm
fb60fa3f9a 查询镇管理公司 2023-09-23 18:59:00 +08:00
chenbo
9f17ef2957 fixed 2023-09-23 18:53:11 +08:00
chenbo
ebaf3caf5d fixed 2023-09-23 18:41:54 +08:00
chenbo
7b40b7d5f5 fix 2023-09-23 18:21:39 +08:00
chenbo
9bacfb181b fix 2023-09-23 18:08:00 +08:00
chenbo
3c09a50839 Merge remote-tracking branch 'origin/dev' into dev 2023-09-23 17:01:39 +08:00
chenbo
dbbc2cd531 debug 2023-09-23 17:00:10 +08:00
mkm
d3df418ff7 更新定位 2023-09-23 16:31:26 +08:00
chenbo
e3d778163a 镇管理官司任务详情接口,任务4提交接口 2023-09-23 16:26:42 +08:00
chenbo
e2309b5a0f 股金变动记录 2023-09-23 16:04:42 +08:00
chenbo
87c79b1ae6 镇管理公司任务类型数据字典 2023-09-23 16:00:37 +08:00
chenbo
0f112c95ca 镇管理公司任务类型数据字典 2023-09-23 15:55:58 +08:00
chenbo
06788042d5 镇管理公司任务-定时下发任务,结算接口 2023-09-23 15:45:40 +08:00
chenbo
5881c0d584 镇管理公司任务-任务6,任务7结算 2023-09-23 15:32:26 +08:00
chenbo
31e438117b 投诉反馈接口 2023-09-23 15:23:21 +08:00
chenbo
e924e9f65a 投诉反馈 2023-09-23 15:18:33 +08:00
chenbo
768e789eca Merge remote-tracking branch 'origin/dev' into dev 2023-09-23 15:12:57 +08:00
chenbo
92591b4b51 投诉反馈 2023-09-23 15:12:45 +08:00
mkm
2e8a756998 Merge pull request '更新' (#33) from preview into dev
Reviewed-on: #33
2023-09-23 14:53:47 +08:00