Commit Graph

  • 36c9d8b82d Merge pull request '排序' (#36) from S01-轨迹中台 into dev liuwenxiang 2024-03-02 16:41:55 +0800
  • 156460db65 Merge pull request '排序' (#35) from S01-轨迹中台 into test liuwenxiang 2024-03-02 16:41:28 +0800
  • 569f566fe2 排序 柳文翔 2024-03-02 16:41:07 +0800
  • 7bfba6e382 Merge branch 'S01-轨迹中台' into test dingenwen 2024-03-02 16:34:29 +0800
  • 2841ae66da Merge pull request 'S01-轨迹中台' (#34) from S01-轨迹中台 into dev liuwenxiang 2024-03-02 16:21:25 +0800
  • 07f603acef Merge branch 'S01-轨迹中台' of http://192.168.80.50:3000/Dotnet/SJZY.Track.Api into S01-轨迹中台 柳文翔 2024-03-02 16:21:05 +0800
  • 4cd66079d0 完成 轨迹模板内容下拉框 接口 柳文翔 2024-03-02 16:21:04 +0800
  • 96c29ae55d Merge branch 'dev' of http://192.168.80.50:3000/Dotnet/SJZY.Track.Api into dev moyongzhen 2024-03-02 16:19:59 +0800
  • ea288979b4 枚举值调整 moyongzhen 2024-03-02 16:19:50 +0800
  • 1967890dba Merge pull request 'S01-轨迹中台' (#33) from S01-轨迹中台 into test liuwenxiang 2024-03-02 15:54:43 +0800
  • 9f37243296 Merge pull request 'S01-轨迹中台' (#32) from S01-轨迹中台 into dev liuwenxiang 2024-03-02 15:54:34 +0800
  • f0bf725e79 Merge branch 'S01-轨迹中台' of http://192.168.80.50:3000/Dotnet/SJZY.Track.Api into S01-轨迹中台 柳文翔 2024-03-02 15:54:16 +0800
  • 570ffbbdf1 1 柳文翔 2024-03-02 15:54:15 +0800
  • 078e2fd448 Merge branch 'S01-轨迹中台' into dev moyongzhen 2024-03-02 15:53:21 +0800
  • 8fc907d025 Merge branch 'S01-轨迹中台' of http://192.168.80.50:3000/Dotnet/SJZY.Track.Api into S01-轨迹中台 moyongzhen 2024-03-02 15:52:22 +0800
  • 6da3e0748c 轨迹内容删除校验 moyongzhen 2024-03-02 15:52:12 +0800
  • 8b4219a8ad Merge remote-tracking branch 'origin/S01-轨迹中台' into S01-轨迹中台 李鹏军 2024-03-02 15:35:54 +0800
  • 5fa20966ab 轨迹发生 李鹏军 2024-03-02 15:34:26 +0800
  • 0c1fe3cbde Merge pull request '修改' (#31) from S01-轨迹中台 into dev liuwenxiang 2024-03-02 15:30:04 +0800
  • d6ec50cbc8 Merge pull request '修改' (#30) from S01-轨迹中台 into test liuwenxiang 2024-03-02 15:29:39 +0800
  • 04733815d5 修改 柳文翔 2024-03-02 15:29:08 +0800
  • bb2f0f650c Merge pull request 'S01-轨迹中台' (#29) from S01-轨迹中台 into test liuwenxiang 2024-03-02 15:08:24 +0800
  • d74e8d3d46 Merge pull request 'S01-轨迹中台' (#28) from S01-轨迹中台 into dev liuwenxiang 2024-03-02 15:08:15 +0800
  • 2d7ed5d2a5 Merge branch 'S01-轨迹中台' of http://192.168.80.50:3000/Dotnet/SJZY.Track.Api into S01-轨迹中台 柳文翔 2024-03-02 15:07:51 +0800
  • 3e908cb7ef 修改字段 柳文翔 2024-03-02 15:07:49 +0800
  • d518bdfa64 Merge branch 'S01-轨迹中台' into test dingenwen 2024-03-02 14:53:19 +0800
  • 92ee6be804 Merge branch 'S01-轨迹中台' into dev moyongzhen 2024-03-02 14:49:23 +0800
  • f48cd3d146 Merge branch 'S01-轨迹中台' of http://192.168.80.50:3000/Dotnet/SJZY.Track.Api into S01-轨迹中台 moyongzhen 2024-03-02 14:47:36 +0800
  • af49cb7bda 删除轨迹内容提示语 moyongzhen 2024-03-02 14:47:28 +0800
  • ce6e637a6b Merge pull request '修改提示语' (#27) from S01-轨迹中台 into dev liuwenxiang 2024-03-02 14:46:54 +0800
  • 48bb84a2fd Merge pull request '修改提示语' (#26) from S01-轨迹中台 into test liuwenxiang 2024-03-02 14:46:40 +0800
  • a2e5580070 修改提示语 柳文翔 2024-03-02 14:46:16 +0800
  • 383d12fbbd Merge pull request 'S01-轨迹中台' (#25) from S01-轨迹中台 into test liuwenxiang 2024-03-02 14:41:54 +0800
  • 6503122709 Merge pull request 'S01-轨迹中台' (#24) from S01-轨迹中台 into dev liuwenxiang 2024-03-02 14:41:40 +0800
  • 35ce79fd99 Merge branch 'S01-轨迹中台' of http://192.168.80.50:3000/Dotnet/SJZY.Track.Api into S01-轨迹中台 柳文翔 2024-03-02 14:41:17 +0800
  • 904b44e262 入参校验 柳文翔 2024-03-02 14:41:15 +0800
  • 19a0f93841 Merge branch 'S01-轨迹中台' into dev moyongzhen 2024-03-02 14:21:13 +0800
  • b8357b33d7 Merge branch 'S01-轨迹中台' of http://192.168.80.50:3000/Dotnet/SJZY.Track.Api into S01-轨迹中台 moyongzhen 2024-03-02 14:20:31 +0800
  • b95ca01d62 轨迹订单查询 字符串数组改成字符串 moyongzhen 2024-03-02 14:20:23 +0800
  • 3c1d9014de Merge pull request '补充提交' (#23) from S01-轨迹中台 into dev liuwenxiang 2024-03-02 13:54:37 +0800
  • 046999c208 补充提交 柳文翔 2024-03-02 13:54:26 +0800
  • 47060c81d4 Merge pull request '修改' (#22) from S01-轨迹中台 into dev liuwenxiang 2024-03-02 13:53:14 +0800
  • bed691aa71 修改 柳文翔 2024-03-02 13:52:51 +0800
  • cdcce93aaa Merge pull request '去重' (#21) from S01-轨迹中台 into dev liuwenxiang 2024-03-02 13:01:54 +0800
  • fefc52638a 去重 柳文翔 2024-03-02 13:01:35 +0800
  • 7342070d5a Merge pull request '字段修改' (#20) from S01-轨迹中台 into dev liuwenxiang 2024-03-02 12:47:36 +0800
  • 884a802481 字段修改 柳文翔 2024-03-02 12:47:20 +0800
  • 4813d880a9 Merge pull request 'S01-轨迹中台' (#19) from S01-轨迹中台 into dev liuwenxiang 2024-03-02 12:43:44 +0800
  • 91a99ad66e Merge branch 'S01-轨迹中台' of http://192.168.80.50:3000/Dotnet/SJZY.Track.Api into S01-轨迹中台 柳文翔 2024-03-02 12:42:49 +0800
  • b21b6402e9 修改 柳文翔 2024-03-02 12:42:48 +0800
  • e7f7eecbe0 Merge branch 'S01-轨迹中台' into dev moyongzhen 2024-03-02 12:16:36 +0800
  • cbdba985c2 验证 轨迹订单 页面 列表数据 显示是否正确-列表数据按创建时间倒序显示 moyongzhen 2024-03-02 12:07:11 +0800
  • 59a5818be5 Merge pull request 'S01-轨迹中台' (#18) from S01-轨迹中台 into dev liuwenxiang 2024-03-02 11:52:20 +0800
  • a9d7ab72b2 Merge branch 'S01-轨迹中台' of http://192.168.80.50:3000/Dotnet/SJZY.Track.Api into S01-轨迹中台 柳文翔 2024-03-02 11:52:11 +0800
  • d0e25fe708 修改错误 柳文翔 2024-03-02 11:52:09 +0800
  • a47465758f Merge branch 'S01-轨迹中台' into dev moyongzhen 2024-03-02 11:35:17 +0800
  • c977cd1c35 轨迹内容分页接口添加轨迹状态查询 moyongzhen 2024-03-02 11:34:26 +0800
  • 0ae4e49e19 Merge pull request '修改字段类型' (#17) from S01-轨迹中台 into dev liuwenxiang 2024-03-02 11:25:53 +0800
  • 756268cb06 修改字段类型 柳文翔 2024-03-02 11:25:40 +0800
  • 0500165708 Merge pull request 'S01-轨迹中台' (#16) from S01-轨迹中台 into dev liuwenxiang 2024-03-02 11:11:34 +0800
  • cd0d2a64bf Merge branch 'S01-轨迹中台' of http://192.168.80.50:3000/Dotnet/SJZY.Track.Api into S01-轨迹中台 柳文翔 2024-03-02 11:11:22 +0800
  • 92ca158be8 修改isany 柳文翔 2024-03-02 11:11:20 +0800
  • 2f837a061b Merge branch 'S01-轨迹中台' of http://192.168.80.50:3000/Dotnet/SJZY.Track.Api into S01-轨迹中台 moyongzhen 2024-03-02 11:03:40 +0800
  • 0352b77dcf 订单列表添加字段 moyongzhen 2024-03-02 11:03:33 +0800
  • 7fbbe2635f Merge pull request '添加返回值' (#15) from S01-轨迹中台 into dev liuwenxiang 2024-03-02 11:03:30 +0800
  • 925bf307b9 添加返回值 柳文翔 2024-03-02 11:03:12 +0800
  • 69a0c572f7 Merge pull request '添加选中项' (#14) from S01-轨迹中台 into dev liuwenxiang 2024-03-02 10:44:39 +0800
  • f569a16f60 添加选中项 柳文翔 2024-03-02 10:44:24 +0800
  • 130c8ce17a Merge pull request 'S01-轨迹中台' (#13) from S01-轨迹中台 into dev liuwenxiang 2024-03-02 10:08:22 +0800
  • 6c10a6e21c 完成 轨迹模板内容排序 接口 柳文翔 2024-03-02 10:07:59 +0800
  • df4772b5c5 Merge branch 'S01-轨迹中台' of http://192.168.80.50:3000/Dotnet/SJZY.Track.Api into S01-轨迹中台 柳文翔 2024-03-02 10:00:11 +0800
  • 92f61e1a1b 完成 轨迹推送配置内容排序 接口 柳文翔 2024-03-02 10:00:08 +0800
  • c8afebe635 Merge branch 'S01-轨迹中台' into dev moyongzhen 2024-03-02 09:59:33 +0800
  • e1958fe96e 调整提示语 moyongzhen 2024-03-02 09:59:04 +0800
  • e9128e1985 轨迹状态提示语 moyongzhen 2024-03-02 09:54:40 +0800
  • c3980b6abb Merge branch 'S01-轨迹中台' into dev moyongzhen 2024-03-02 09:51:26 +0800
  • 2dc9c7f31b 轨迹状态校验 moyongzhen 2024-03-02 09:50:31 +0800
  • 6ab8472a4c 轨迹模版提示语 moyongzhen 2024-03-02 09:41:05 +0800
  • eee208a812 Merge pull request 'S01-轨迹中台' (#12) from S01-轨迹中台 into dev liuwenxiang 2024-03-02 09:19:56 +0800
  • 4e6b9671e1 修改配置 dingenwen 2024-03-02 09:17:16 +0800
  • 51099d850b Merge branch 'S01-轨迹中台' of http://192.168.80.50:3000/Dotnet/SJZY.Track.Api into S01-轨迹中台 dingenwen 2024-03-02 09:14:28 +0800
  • 0780315c9c Merge branch 'S01-轨迹中台' of http://192.168.80.50:3000/Dotnet/SJZY.Track.Api into S01-轨迹中台 柳文翔 2024-03-02 09:13:45 +0800
  • 6d7c28652b 还原 柳文翔 2024-03-02 09:13:43 +0800
  • e4da002a82 Merge branch 'dev' of http://192.168.80.50:3000/Dotnet/SJZY.Track.Api into dev moyongzhen 2024-03-02 09:10:04 +0800
  • e2802de99e 轨迹模版新增校验 moyongzhen 2024-03-02 09:10:00 +0800
  • 45ac0a3e53 Merge branch 'S01-轨迹中台' of http://192.168.80.50:3000/Dotnet/SJZY.Track.Api into S01-轨迹中台 dingenwen 2024-03-02 09:00:35 +0800
  • 666080382b Merge pull request '删除' (#11) from S01-轨迹中台 into dev liuwenxiang 2024-03-01 23:22:07 +0800
  • a4718386f1 删除 柳文翔 2024-03-01 23:21:49 +0800
  • e049d7520b Merge pull request '修改接口' (#10) from S01-轨迹中台 into dev liuwenxiang 2024-03-01 23:08:42 +0800
  • a327f0bcbf 修改接口 柳文翔 2024-03-01 23:08:25 +0800
  • 7b9fe50794 Merge pull request 'S01-轨迹中台' (#9) from S01-轨迹中台 into dev liuwenxiang 2024-03-01 22:12:14 +0800
  • 777cf29baa 修改轨迹推送 柳文翔 2024-03-01 22:11:45 +0800
  • e40ea3bdba 修改轨迹内容时同步修改轨迹内容映射 柳文翔 2024-03-01 21:42:32 +0800
  • 7f7dab910c Merge pull request '完成 轨迹内容映射编辑 接口' (#8) from S01-轨迹中台 into dev liuwenxiang 2024-03-01 21:13:12 +0800
  • ad56431c39 完成 轨迹内容映射编辑 接口 柳文翔 2024-03-01 21:11:43 +0800
  • dbec2f00fd Merge pull request '创建 轨迹内容映射编辑 接口' (#7) from S01-轨迹中台 into dev liuwenxiang 2024-03-01 20:59:02 +0800
  • 2292b7433d 创建 轨迹内容映射编辑 接口 柳文翔 2024-03-01 20:58:48 +0800
  • 6a5775819f Merge pull request '完成 轨迹内容映射详情 接口' (#6) from S01-轨迹中台 into dev liuwenxiang 2024-03-01 20:42:17 +0800
  • 867b987f9a 完成 轨迹内容映射详情 接口 柳文翔 2024-03-01 20:42:06 +0800
  • 9ae6a0c359 Merge pull request '完成 轨迹内容映射列表 接口' (#5) from S01-轨迹中台 into dev liuwenxiang 2024-03-01 20:30:39 +0800