Commit Graph

21 Commits

Author SHA1 Message Date
8cc5132e9b Merge remote-tracking branch 'origin/deng' into deng
# Conflicts:
#	src/main/webapp/jsp/user/roleMenu.jsp
2026-03-05 10:18:52 +08:00
26031a77da 修改所属泵站和权限 2026-03-05 10:18:06 +08:00
696597feba 大屏更新、源头管理 2026-03-05 03:08:24 +08:00
258d3d7c13 官网管理对接、大屏更新 2026-03-05 00:35:31 +08:00
96605402a5 员工考勤对接前端,后端未实装 2026-03-03 16:35:12 +08:00
20d389aa4d Merge remote-tracking branch 'origin/deng' into deng 2026-03-03 15:39:09 +08:00
df1367b914 车闸对接前端,后端未实装 2026-03-03 15:39:02 +08:00
44bf9d6a43 大屏 2026-03-01 23:40:06 +08:00
c16744b761 Merge branch 'deng' of http://101.43.41.9:13000/xzzn/SIPAIIS_WMS_JSSW into deng 2026-03-01 23:31:50 +08:00
1fc6272098 场外管道管理 2026-03-01 23:20:13 +08:00
c791bcdc72 login-title 2026-02-25 17:55:27 +08:00
e847ff6626 diff 2026-02-08 22:57:30 +08:00
fcf08b8b69 登录页UI、主页UI 2026-02-08 01:02:58 +08:00
580606c267 大屏静态数据 2026-02-06 16:30:47 +08:00
14c9bd8ce0 大屏数据展示 2026-02-04 23:46:37 +08:00
79a8fc11cf Merge branch 'deng' of http://101.43.41.9:13000/xzzn/SIPAIIS_WMS_JSSW into deng 2026-02-02 23:52:52 +08:00
5133e4f983 git 2026-02-02 23:52:49 +08:00
b4932d17c4 TGLW bug fix 2026-02-02 23:29:47 +08:00
b2973c6d28 UI、logo 2026-02-02 14:44:36 +08:00
2bb62e0efa init config 2026-01-30 01:38:16 +08:00
903ff8d495 first commit 2026-01-16 14:13:44 +08:00