Commit Graph

458 Commits (9d3cbc523767000d9323fe4c1bb74004578b4fcd)

Author SHA1 Message Date
姜玉琦 7be144b0da 提交diamagnetic 2024-04-24 09:54:41 +08:00
haha 2564638487 update code 2024-04-24 00:26:19 +08:00
姜玉琦 68b30653a4 提交代码 2024-04-22 22:59:51 +08:00
姜玉琦 9a2890f78e Merge branch 'dev' of http://62.234.3.186:3000/sxyanzhu/jhprjv2 into dev 2024-04-22 22:10:50 +08:00
姜玉琦 64a606452e 提交代码 2024-04-22 22:10:44 +08:00
haha 70a406f8c1 update code 2024-04-22 22:09:58 +08:00
姜玉琦 5561d11cb3 提交代码 2024-04-21 21:52:07 +08:00
姜玉琦 472477e385 提交 2024-04-21 21:45:46 +08:00
姜玉琦 43800049e6 提交代码 2024-04-21 21:35:47 +08:00
姜玉琦 50e93eb810 Merge branch 'dev' of http://62.234.3.186:3000/sxyanzhu/jhprjv2 into dev 2024-04-21 16:16:19 +08:00
姜玉琦 4edca70f3d 提交数据 2024-04-21 16:16:12 +08:00
haha 57b14f135e update code 2024-04-21 15:27:01 +08:00
haha 07ed3deb3d update code 2024-04-21 15:05:04 +08:00
姜玉琦 57fb2aeca4 提交代码 2024-04-21 14:01:12 +08:00
姜玉琦 65c562bdd8 提交代码 2024-04-21 13:42:36 +08:00
姜玉琦 895c8df662 Merge branch 'dev' of http://62.234.3.186:3000/sxyanzhu/jhprjv2 into dev 2024-04-21 13:07:40 +08:00
姜玉琦 17bd1141f2 提交代码 2024-04-21 13:07:30 +08:00
haha 7df7c1eb5a update code 2024-04-20 22:29:34 +08:00
姜玉琦 694b343fcb 提交代码 2024-04-20 16:19:35 +08:00
姜玉琦 7976f3018e 提交代码 2024-04-19 22:07:48 +08:00
姜玉琦 608eeaa964 提交代码 2024-04-19 12:48:34 +08:00
haha 11fac30ca2 update code 2024-04-18 23:28:34 +08:00
haha c852080ed4 update code 2024-04-17 21:51:46 +08:00
姜玉琦 ebfd22a37b Merge branch 'dev' of http://62.234.3.186:3000/sxyanzhu/jhprjv2 into dev 2024-04-17 02:18:42 +08:00
姜玉琦 817086dd2a 提交 2024-04-17 02:18:33 +08:00
haha cac64f79d5 update code 2024-04-17 00:32:01 +08:00
haha e62220744c update code 2024-04-16 00:22:29 +08:00
姜玉琦 7033395690 Merge branch 'dev' of http://62.234.3.186:3000/sxyanzhu/jhprjv2 into dev 2024-04-15 22:40:00 +08:00
姜玉琦 b60ad07a83 提交代码 2024-04-15 22:39:53 +08:00
haha 9cca67e0c0 update code 2024-04-15 21:10:17 +08:00
haha 469a6e7381 update code 2024-04-15 20:38:21 +08:00
姜玉琦 718ff531fc Merge branch 'dev' of http://62.234.3.186:3000/sxyanzhu/jhprjv2 into dev 2024-04-14 23:55:40 +08:00
姜玉琦 fb1bb46ca1 提交代码 2024-04-14 23:54:57 +08:00
haha 1f492bc77f update code 2024-04-14 23:25:20 +08:00
haha ea1a05658e update code 2024-04-14 22:29:50 +08:00
姜玉琦 ed2f1aba5f 提u叫 2024-04-14 22:14:32 +08:00
姜玉琦 d57b016f25 提交代码 2024-04-12 00:55:00 +08:00
姜玉琦 83e7899ca5 提交 2024-04-11 02:25:25 +08:00
haha eecdfb9d2c update code 2024-04-11 00:26:45 +08:00
姜玉琦 0c3bd22fea 提交代码 2024-04-10 23:16:24 +08:00
haha f4ae458d92 update code 2024-04-10 22:55:33 +08:00
姜玉琦 a9f5df0eb5 Merge branch 'dev' of http://62.234.3.186:3000/sxyanzhu/jhprjv2 into dev 2024-04-10 11:57:20 +08:00
姜玉琦 208fe7f81f 提交整改 2024-04-10 11:57:13 +08:00
haha eb5bc695d0 update code 2024-04-10 00:12:56 +08:00
姜玉琦 ed1d3cfb75 提交代码 2024-04-09 23:13:01 +08:00
haha 2c67e41fee update code 2024-04-09 22:40:11 +08:00
haha e7a6e0309f update code 2024-04-09 22:22:23 +08:00
haha b7369b07cc update code 2024-04-09 21:48:00 +08:00
姜玉琦 675007d23b 提交diamond 2024-04-09 21:46:26 +08:00
姜玉琦 f8833cd1fd Merge branch 'dev' of http://62.234.3.186:3000/sxyanzhu/jhprjv2 into dev 2024-04-09 00:57:40 +08:00
姜玉琦 265a7abb1a 提交代码 2024-04-09 00:57:32 +08:00
haha 61cac97d84 update code 2024-04-09 00:27:00 +08:00
haha 1d4bb33bda Merge branch 'dev' of http://62.234.3.186:3000/sxyanzhu/jhprjv2 into dev 2024-04-09 00:01:47 +08:00
haha eebd27dfb5 update code 2024-04-09 00:01:26 +08:00
姜玉琦 06d152aaeb Merge branch 'dev' of http://62.234.3.186:3000/sxyanzhu/jhprjv2 into dev 2024-04-08 23:34:56 +08:00
haha 527aa28a0b update code 2024-04-08 23:34:32 +08:00
姜玉琦 8810677ca7 提交代码 2024-04-08 23:34:22 +08:00
姜玉琦 963d86f209 提交代码 2024-04-08 11:33:58 +08:00
haha be19c476b5 update code 2024-04-08 02:08:28 +08:00
haha 73690ae5c2 update code 2024-04-08 01:54:00 +08:00
haha 26316752c1 update code 2024-04-07 21:18:24 +08:00
姜玉琦 e9c16e7964 提交代码 2024-04-07 00:51:44 +08:00
haha d4e38dc40f update code 2024-04-07 00:07:56 +08:00
haha da63db6425 update code 2024-04-06 23:41:04 +08:00
haha f4bb8d22df update code 2024-04-06 23:25:16 +08:00
姜玉琦 ec8cf4060c 提交diamagnetic 2024-04-06 22:51:35 +08:00
haha 9b3feddcfb update code 2024-04-06 21:21:55 +08:00
姜玉琦 194d6214c6 Merge branch 'dev' of http://62.234.3.186:3000/sxyanzhu/jhprjv2 into dev 2024-04-06 17:59:18 +08:00
姜玉琦 f8e82414ad 提交代码 2024-04-06 17:59:11 +08:00
haha e21756cd24 update code 2024-04-06 17:39:54 +08:00
haha 645944e305 update code 2024-04-06 16:14:18 +08:00
姜玉琦 d525dcd0a6 提交代码 2024-04-06 13:55:01 +08:00
姜玉琦 1dc7cdf4f3 提交代码 2024-04-06 01:31:14 +08:00
姜玉琦 6e84af4b01 提交 2024-04-05 19:26:28 +08:00
姜玉琦 cbec808a2e 提交代码 2024-04-05 19:25:29 +08:00
姜玉琦 cf74666de8 Merge branch 'dev' of http://62.234.3.186:3000/sxyanzhu/jhprjv2 into dev 2024-04-03 01:47:09 +08:00
姜玉琦 8b751cd807 提交代码 2024-04-03 01:47:02 +08:00
haha 46a9633e89 update code 2024-04-01 23:37:58 +08:00
haha 049d84a73b update code 2024-04-01 22:37:40 +08:00
姜玉琦 f974e753d1 Merge branch 'dev' of http://62.234.3.186:3000/sxyanzhu/jhprjv2 into dev 2024-03-31 23:42:08 +08:00
姜玉琦 ea6ee3af97 提交代码 2024-03-31 23:42:01 +08:00
haha fb02b1a244 update code 2024-03-31 23:40:18 +08:00
姜玉琦 3ceb360237 Merge branch 'dev' of http://62.234.3.186:3000/sxyanzhu/jhprjv2 into dev 2024-03-31 23:32:09 +08:00
姜玉琦 f57eb151db 提交代码 2024-03-31 23:32:00 +08:00
haha 18285da559 update code 2024-03-31 23:02:00 +08:00
haha 8bd551dce8 update code 2024-03-30 22:20:24 +08:00
haha 47bc7fe61a update code 2024-03-30 00:04:23 +08:00
haha ff87c12d35 update code 2024-03-29 00:19:44 +08:00
姜玉琦 6d76c84442 1 2024-03-28 23:29:23 +08:00
姜玉琦 10ee8994c2 Merge branch 'dev' of http://62.234.3.186:3000/sxyanzhu/jhprjv2 into dev 2024-03-28 23:20:41 +08:00
姜玉琦 8b06d3e889 提交代码 2024-03-28 23:20:28 +08:00
haha 8a49d3f250 update code 2024-03-28 22:02:25 +08:00
姜玉琦 b21bbf095d Merge branch 'dev' of http://62.234.3.186:3000/sxyanzhu/jhprjv2 into dev 2024-03-28 13:24:57 +08:00
姜玉琦 9fc9b9e3b2 提交代码 2024-03-28 13:23:41 +08:00
haha 936d499927 update code 2024-03-28 00:10:50 +08:00
haha 9c7a500916 update code 2024-03-26 02:05:09 +08:00
haha e2524e4bdf update code 2024-03-26 01:44:19 +08:00
姜玉琦 8edb022406 Merge branch 'dev' of http://62.234.3.186:3000/sxyanzhu/jhprjv2 into dev 2024-03-26 01:13:28 +08:00
姜玉琦 be10111f98 提交代码 2024-03-26 01:13:20 +08:00
haha 1be2c0e05c update code 2024-03-26 01:13:02 +08:00
haha 745f2ee510 Merge branch 'dev' of http://62.234.3.186:3000/sxyanzhu/jhprjv2 into dev 2024-03-26 01:06:17 +08:00
haha a88422a963 update code 2024-03-26 01:05:54 +08:00
姜玉琦 cdcefab554 提交代码 2024-03-26 00:51:10 +08:00
haha 4b9a42c288 update code 2024-03-25 23:43:54 +08:00
haha 0afd1137bb update code 2024-03-24 23:44:10 +08:00
姜玉琦 05b4938827 提交代码 2024-03-24 23:39:57 +08:00
haha cb0cb1fce7 update code 2024-03-23 22:51:05 +08:00
haha 41a8a5179d update code 2024-03-23 18:32:18 +08:00
姜玉琦 5c90be5110 提交代码 2024-03-23 03:30:53 +08:00
姜玉琦 04004b10ee Merge branch 'dev' of http://62.234.3.186:3000/sxyanzhu/jhprjv2 into dev 2024-03-23 03:15:13 +08:00
姜玉琦 1693ba2efc 提交代码 2024-03-23 03:15:07 +08:00
haha d67247be37 update code 2024-03-23 03:02:33 +08:00
姜玉琦 25aa45ba70 提交代码 2024-03-23 02:44:12 +08:00
姜玉琦 b44d75bf37 提交代码 2024-03-23 02:42:31 +08:00
姜玉琦 0f8e5522cd Merge branch 'dev' of http://62.234.3.186:3000/sxyanzhu/jhprjv2 into dev 2024-03-23 02:29:57 +08:00
姜玉琦 56c53fb4ab 提交代码 2024-03-23 02:29:51 +08:00
haha 4627b967c0 update code 2024-03-23 02:28:39 +08:00
haha b5110ca8e6 update code 2024-03-23 02:17:39 +08:00
haha 9bade2237e update code 2024-03-23 01:33:04 +08:00
haha ce59957910 Merge branch 'dev' of http://62.234.3.186:3000/sxyanzhu/jhprjv2 into dev 2024-03-23 01:27:34 +08:00
haha 32b5398830 update code 2024-03-23 01:27:13 +08:00
姜玉琦 5e6933cc3d 提交代码 2024-03-23 01:02:55 +08:00
姜玉琦 f5205e4dba Merge branch 'dev' of http://62.234.3.186:3000/sxyanzhu/jhprjv2 into dev 2024-03-23 00:59:15 +08:00
姜玉琦 6c2eb7ee27 体哦 2024-03-23 00:59:08 +08:00
haha ae8e44db92 update code 2024-03-23 00:57:06 +08:00
姜玉琦 be9b9b3846 提交代码 2024-03-23 00:26:46 +08:00
haha 007804ab37 update code 2024-03-23 00:22:47 +08:00
姜玉琦 d5fbe11cc9 提交代码 2024-03-23 00:17:15 +08:00
姜玉琦 378f6da4a3 Merge branch 'dev' of http://62.234.3.186:3000/sxyanzhu/jhprjv2 into dev
# Conflicts:
#	yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectAttendanceDataServiceImpl.java
2024-03-23 00:14:22 +08:00
姜玉琦 8427bd6235 提交代码 2024-03-23 00:11:55 +08:00
haha e5d1c14842 update code 2024-03-22 23:44:12 +08:00
haha 5978c46fc0 update code 2024-03-22 22:44:32 +08:00
haha 6edebbef77 update code 2024-03-22 22:00:33 +08:00
haha 17d7b923e2 Merge branch 'dev' of http://62.234.3.186:3000/sxyanzhu/jhprjv2 into dev 2024-03-22 21:59:10 +08:00
姜玉琦 b679930530 提交 2024-03-22 01:23:53 +08:00
姜玉琦 ad4692ea79 提交 2024-03-22 01:09:31 +08:00
haha 6886d5b521 update code 2024-03-22 00:25:31 +08:00
姜玉琦 cf1bbc65a8 Merge branch 'dev' of http://62.234.3.186:3000/sxyanzhu/jhprjv2 into dev 2024-03-21 23:12:02 +08:00
姜玉琦 391d800ea9 提交代码 2024-03-21 23:11:55 +08:00
haha 346b3e1443 update code 2024-03-21 23:09:58 +08:00
haha 978434df1f update code 2024-03-20 23:38:25 +08:00
姜玉琦 1b8fb5fac3 Merge branch 'dev' of http://62.234.3.186:3000/sxyanzhu/jhprjv2 into dev 2024-03-17 17:00:20 +08:00
姜玉琦 10aa8b23a7 提交代码 2024-03-17 17:00:12 +08:00
haha e1e82f7796 update code 2024-03-16 15:29:07 +08:00
haha 9f80befa1a update code 华筑考勤无效数据不入库 2024-03-16 14:39:54 +08:00
haha 6afbc7d937 update code 2024-03-16 00:02:59 +08:00
haha 6ed84b9dad 增加济工考勤 2024-03-15 23:25:37 +08:00
haha 09de575360 update code 2024-03-14 23:11:14 +08:00
haha 9566d0e9c6 update code 2024-03-14 22:36:26 +08:00
姜玉琦 7b40942bcc 提交代码 2024-03-14 13:51:55 +08:00