Commit Graph

429 Commits (7faee8c01e7272ea84d80b2dddcb20ffbd202882)

Author SHA1 Message Date
luotaiqian f6f9089dc7 sign 2026-08-07 10:53:17 +08:00
zhanglei 59f3fa5301 线上: bug 2026-08-07 10:42:02 +08:00
luotaiqian 7b3eb56ad6 sign 2026-08-06 17:47:16 +08:00
zhanglei acc8b3abe6 线上: bug 2026-08-06 17:22:32 +08:00
luotaiqian 25a5d58847 sign 2026-08-06 16:58:46 +08:00
luotaiqian daab31b998 sign 2026-08-06 16:54:25 +08:00
zhanglei 61b0c76aa2 线上: bug 2026-08-06 15:52:28 +08:00
zhanglei b5f0c0992f 员工信息管理,重置密码(用户自行输入密码) 2026-08-06 14:24:02 +08:00
luotaiqian 173084e016 sign 2026-08-05 21:02:28 +08:00
luotaiqian 0dd4fcece8 sign 2026-08-05 20:46:48 +08:00
luotaiqian 50ee791408 sign 2026-08-05 20:23:11 +08:00
luotaiqian 0c003d02c2 sign 2026-08-05 19:51:02 +08:00
luotaiqian 86cccac2ff Merge remote-tracking branch 'origin/dev' into dev 2026-08-05 19:36:13 +08:00
luotaiqian 8a09b5762e sign 2026-08-05 19:36:01 +08:00
zhanglei 7e92012fe9 app,消息通知, 新增未读消息统计 2026-08-05 19:31:29 +08:00
zhanglei 80aab925f4 app,我的项目修改 2026-08-05 19:23:18 +08:00
luotaiqian d057e1fdda sign 2026-08-05 19:17:06 +08:00
luotaiqian 737a68fa3b Merge remote-tracking branch 'origin/dev' into dev 2026-08-05 17:55:28 +08:00
luotaiqian 912a365a34 auth 2026-08-05 17:55:22 +08:00
zhanglei 9289d76d09 app,我的项目修改 2026-08-05 17:30:43 +08:00
luotaiqian 13e238f1f9 auth 2026-08-05 17:10:36 +08:00
luotaiqian 2a80c8f524 auth 2026-08-05 14:49:25 +08:00
luotaiqian 3014eef505 person 2026-08-05 11:51:36 +08:00
zhanglei ebd8a2eb24 wps调整 2026-08-05 10:48:13 +08:00
luotaiqian 8318de725b person 2026-08-05 10:41:52 +08:00
luotaiqian 014e71a1aa person 2026-08-05 10:16:25 +08:00
zhanglei 21fa58aec7 新需求,资质管理下发app签字管理 2026-08-04 19:45:30 +08:00
luotaiqian 30f5df84d4 person 2026-08-04 17:17:53 +08:00
luotaiqian 32cdda3115 person 2026-08-04 16:13:51 +08:00
luotaiqian ba382e5d6f Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
#	safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/OrgPersonnelExecutor.java
2026-08-04 16:07:27 +08:00
luotaiqian 91b53ec045 person 2026-08-04 16:06:24 +08:00
huwei 4cfb569fed Merge remote-tracking branch 'origin/dev' into dev 2026-08-04 16:02:34 +08:00
huwei 574d847bbc Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
#	safety-eval-app/src/main/java/org/qinan/safetyeval/app/support/OrgPersonnelViewEnricher.java
2026-08-04 16:02:10 +08:00
zhanglei c4ed15d8e4 新需求,资质管理下发app签字管理 2026-08-04 16:01:56 +08:00
huwei b4400b384e 新增监管端和机构端首页数据 2026-08-04 15:59:28 +08:00
luotaiqian 7962d4daa6 import 2026-08-04 15:26:28 +08:00
luotaiqian b88ef08a8b import 2026-08-04 15:12:25 +08:00
zhanglei be9b06b765 新需求,资质管理下发app签字管理 2026-08-04 14:38:40 +08:00
luotaiqian 3ead1e18b5 import 2026-08-04 14:37:43 +08:00
luotaiqian a49943078e import 2026-08-04 11:09:41 +08:00
zhanglei 9e78830cac 移动bug 2026-08-04 10:14:16 +08:00
zhanglei 784845fc74 移动bug 2026-08-04 09:47:29 +08:00
luotaiqian f0ebc579ab import 2026-08-04 09:42:12 +08:00
luotaiqian 331babfcdf import 2026-08-03 18:21:29 +08:00
luotaiqian a439eb098a import 2026-08-03 17:58:11 +08:00
luotaiqian fbdaf64a59 import 2026-08-03 17:39:08 +08:00
zhanglei 73370b5d78 提交 2026-08-03 15:52:12 +08:00
huwei a1beb09e48 Merge remote-tracking branch 'origin/dev' into dev 2026-08-03 15:48:19 +08:00
huwei cc604203c5 新增监管端和机构端首页数据 2026-08-03 15:48:10 +08:00
luotaiqian ae2e1bf820 Merge remote-tracking branch 'origin/dev' into dev 2026-08-03 15:05:22 +08:00
luotaiqian 0cb70fdd3b import 2026-08-03 15:05:14 +08:00
zhanglei 1e8188ff99 提交 2026-08-03 13:32:32 +08:00
zhanglei 03f428c266 提交 2026-08-03 11:51:03 +08:00
zhanglei 29526b8431 提交 2026-08-03 11:25:07 +08:00
luotaiqian 519cddd842 import 2026-08-03 11:01:30 +08:00
luotaiqian d1db56705f import 2026-08-03 10:41:37 +08:00
luotaiqian 135ed094d3 import 2026-08-03 10:26:46 +08:00
luotaiqian 311fbf6946 import 2026-08-03 09:43:39 +08:00
luotaiqian 2dd150bbe7 import 2026-08-03 09:35:14 +08:00
luotaiqian 796de974a5 import 2026-08-03 09:25:36 +08:00
luotaiqian 591884f6ec fix bug 2026-07-31 16:55:12 +08:00
luotaiqian 72831ef655 fix bug 2026-07-31 16:50:10 +08:00
luotaiqian d61fe350aa fix bug 2026-07-31 16:25:39 +08:00
luotaiqian a482287203 fix bug 2026-07-31 16:13:26 +08:00
huwei 95b65482b1 新增监管端和机构端首页数据 2026-07-31 16:09:54 +08:00
huwei 4d426f2bc1 新增监管端和机构端首页数据 2026-07-31 15:52:56 +08:00
huwei f98bdee91f 新增监管端和机构端首页数据 2026-07-31 15:41:58 +08:00
huwei dec6a6d5af 新增监管端和机构端首页数据 2026-07-31 15:28:09 +08:00
huwei 06f271df83 Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
#	safety-eval-start/src/main/resources/templates/safetyEval.html
2026-07-31 15:16:20 +08:00
huwei d282ccef01 新增监管端和机构端首页数据 2026-07-31 15:14:59 +08:00
luotaiqian 97670a6efa fix bug 2026-07-31 14:10:15 +08:00
luotaiqian ca6a702240 fix bug 2026-07-31 14:03:05 +08:00
luotaiqian 4cf41dd005 fix bug 2026-07-31 13:51:37 +08:00
luotaiqian 3feb9f9d43 fix bug 2026-07-31 11:02:20 +08:00
luotaiqian 59d6b68036 fix bug 2026-07-31 10:52:13 +08:00
luotaiqian a8c7db0c5f fix bug 2026-07-31 09:46:43 +08:00
zhanglei 677042a75d 提交 2026-07-30 11:12:33 +08:00
luotaiqian 4332249a62 Merge remote-tracking branch 'origin/dev' into dev 2026-07-30 10:17:12 +08:00
luotaiqian 0508da896a fix bug 2026-07-30 10:17:06 +08:00
zhanglei b40bee95ec 提交 2026-07-30 09:58:26 +08:00
luotaiqian 48744a4165 fix bug 2026-07-30 09:43:37 +08:00
luotaiqian b9670b50f1 fix bug 2026-07-29 17:35:12 +08:00
luotaiqian 5b926d6554 Merge remote-tracking branch 'origin/dev' into dev 2026-07-29 16:54:34 +08:00
luotaiqian fec0ccf685 1 2026-07-29 16:54:27 +08:00
zhanglei 469994fa9d bug 2026-07-29 16:43:27 +08:00
huwei 094b1ab5ad 人脸识别 2026-07-29 14:50:55 +08:00
luotaiqian 4a512c35f9 1 2026-07-28 18:09:52 +08:00
luotaiqian 9ca4a49991 1 2026-07-28 17:53:20 +08:00
zhanglei 457183cafa feat: app查询我的项目调整 2026-07-28 17:12:32 +08:00
luotaiqian 9d37179894 1 2026-07-28 14:35:36 +08:00
zhanglei 892020de65 feat: 风险分析, 新增字段 2026-07-28 10:46:22 +08:00
huwei b1595c3b8f Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
#	safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/support/InstitutionOrgSupport.java
2026-07-28 09:10:43 +08:00
huwei 5c7d3fb0fc 检查通知等 2026-07-28 09:09:27 +08:00
zhanglei 407d3c00e4 feat: bug修复 2026-07-27 18:30:28 +08:00
luotaiqian 0b06be853c sms 2026-07-27 18:21:24 +08:00
luotaiqian fffa3477e9 Merge remote-tracking branch 'origin/dev' into dev 2026-07-27 18:20:00 +08:00
luotaiqian d68c36ff4c sms 2026-07-27 18:19:53 +08:00
zhanglei 3e7c193996 feat: bug修复 2026-07-27 17:02:28 +08:00
zhanglei 6874438af3 feat: bug修复 2026-07-27 16:09:20 +08:00
luotaiqian 9d1cea06d4 1 2026-07-27 15:09:57 +08:00
luotaiqian 9b8d233d8f 1 2026-07-27 15:01:05 +08:00
luotaiqian 95f5775e0f Merge remote-tracking branch 'origin/dev' into dev 2026-07-27 14:37:28 +08:00
luotaiqian 4c159ba695 1 2026-07-27 14:37:22 +08:00
zhanglei 05147f52d2 feat: 移动端 2026-07-27 14:35:47 +08:00
luotaiqian 6ecc871fd5 1 2026-07-27 14:14:26 +08:00
luotaiqian 5f0b79bb05 Merge remote-tracking branch 'origin/dev' into dev 2026-07-27 13:51:12 +08:00
luotaiqian a863916fc6 1 2026-07-27 13:51:05 +08:00
zhanglei 4c225f1467 feat: wps保存文件回调调整 2026-07-27 13:40:20 +08:00
luotaiqian 48be6c639e 1 2026-07-27 11:00:26 +08:00
zhanglei 2f94e414e4 feat: 签字 2026-07-27 10:32:45 +08:00
luotaiqian 38d3bff093 1 2026-07-27 10:25:01 +08:00
luotaiqian 6dee2d13fe 1 2026-07-24 18:05:29 +08:00
luotaiqian 1ff0af62d2 1 2026-07-24 17:32:53 +08:00
luotaiqian e5490f551a 1 2026-07-24 17:23:31 +08:00
luotaiqian 75a0658753 1 2026-07-24 17:11:12 +08:00
luotaiqian fe13c0d57a 1 2026-07-24 15:55:13 +08:00
luotaiqian 5e29452c4d 1 2026-07-24 15:47:00 +08:00
luotaiqian 31957c6bd5 Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
#	safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/institution/EvalSignTaskExecutor.java
2026-07-24 15:41:26 +08:00
luotaiqian 2bae6d28a7 1 2026-07-24 15:40:24 +08:00
zhanglei 4428d42696 feat: 签字 2026-07-24 15:33:33 +08:00
zhanglei e32eee64cc feat: 签字 2026-07-24 15:20:27 +08:00
luotaiqian 5cb71429cd 1 2026-07-24 15:10:06 +08:00
zhanglei 6a2b962fb0 feat: 签字 2026-07-24 14:48:31 +08:00
luotaiqian b779cfc748 1 2026-07-24 14:30:37 +08:00
luotaiqian 8022a8e04a 1 2026-07-24 14:04:02 +08:00
luotaiqian fd242d0693 1 2026-07-24 13:42:37 +08:00
luotaiqian 01479efce3 1 2026-07-24 13:37:53 +08:00
luotaiqian 071fd41976 waring 2026-07-24 11:35:35 +08:00
zhanglei 703a4d5264 feat: 签字 2026-07-24 11:14:01 +08:00
zhanglei 7aa13fef12 feat: 签字 2026-07-24 11:12:48 +08:00
luotaiqian 860b96aab9 waring 2026-07-24 10:52:34 +08:00
luotaiqian 1b2f50e102 Merge remote-tracking branch 'origin/dev' into dev 2026-07-24 09:56:19 +08:00
luotaiqian a1a2757654 waring 2026-07-24 09:56:12 +08:00
zhanglei b3448f97fe feat: wps回调保存成功, 调用节点填充方法 2026-07-24 09:26:24 +08:00
luotaiqian ccf91b290c waring 2026-07-24 09:03:13 +08:00
luotaiqian c997360627 Merge remote-tracking branch 'origin/dev' into dev 2026-07-23 18:40:34 +08:00
luotaiqian 7a6e96f94f waring 2026-07-23 18:40:27 +08:00
zhanglei 6ff29d373f feat: wps新增添加projectId 2026-07-23 18:29:00 +08:00
luotaiqian 5964ba6769 Merge remote-tracking branch 'origin/dev' into dev 2026-07-23 18:20:50 +08:00
luotaiqian 5748fc504a waring 2026-07-23 18:20:42 +08:00
zhanglei 30a62941ab feat: 项目勘探 2026-07-23 18:09:09 +08:00
luotaiqian 72f450a68b waring 2026-07-23 17:37:09 +08:00
luotaiqian 32f5a2ff78 waring 2026-07-23 17:14:29 +08:00
luotaiqian 80e7995583 waring 2026-07-23 16:58:27 +08:00
luotaiqian 9aa4ca81d9 waring 2026-07-23 15:40:28 +08:00
luotaiqian b124a86f85 waring 2026-07-23 15:23:42 +08:00
zhanglei 4618274961 feat: 项目勘探 2026-07-23 14:53:59 +08:00
luotaiqian 0811bff14b waring 2026-07-23 14:44:57 +08:00
zhanglei ae140a7c6e feat: 项目组 2026-07-23 11:29:07 +08:00
luotaiqian bab37f01c2 waring 2026-07-23 11:24:10 +08:00