Commit Graph

26 Commits (b2733dd3d15cd5860f22778d7edde0099fc9a614)

Author SHA1 Message Date
dearlin b2733dd3d1 add:合并线上代码 2023-12-28 20:03:02 +08:00
dearlin a7f6193998 add:重点工程数据同步 2023-12-28 19:33:26 +08:00
guoyuepeng 0a7cacc666 测试环境和正式环境的配置信息, 2023-12-26 16:21:52 +08:00
guoyuepeng 021a6551a3 动态地址的默认信息 2023-12-26 11:48:51 +08:00
guoyuepeng 7a85418098 Merge pull request '分公司可以创建角色等信息' (#7) from corpSystem into 1212-八项作业迁移
Reviewed-on: #7
2023-12-26 09:54:14 +08:00
limingyu 72793b2a76 Merge branch 'lmy20231215-动火bug修改' into 1212-八项作业迁移
# Conflicts:
#	src/main/java/com/zcloud/controller/system/LoginController.java
2023-12-25 13:58:14 +08:00
dearlin 46b4239571 add: app用户登录时候后台地址问题 2023-12-23 11:36:32 +08:00
dearlin b05da152b8 图片传输 2023-12-20 17:16:37 +08:00
dearlin 60ea9c4d6a Merge remote-tracking branch 'origin/czks1.0' into czks1.0
# Conflicts:
#	src/main/java/com/zcloud/aspect/DockingAspect.java
2023-12-20 11:08:59 +08:00
dearlin f0cfa0e9cc 数据同步aop改造 2023-12-20 11:08:33 +08:00
z 88c2a8fdeb 重点工程部分代码 2023-12-19 17:52:09 +08:00
limingyu e29300756e Merge branch 'dev' into lmy20231215-动火bug修改 2023-12-19 14:15:35 +08:00
dearlin b05a521997 企业系统管理 2023-12-19 11:33:26 +08:00
dearlin 062f77fa00 附件上传 2023-12-18 16:14:27 +08:00
dearlin b4c3061e84 沧州矿石项目修改 2023-12-18 10:45:21 +08:00
dearlin f5f2863195 沧州矿石项目修改 2023-12-18 10:43:38 +08:00
zhaoyu 6cb9900bbf 增加31的mq配置 2023-12-18 09:36:47 +08:00
dearlin 331e779e11 add: 数据同步相关aop功能迁移 2023-12-17 15:48:56 +08:00
dearlin 7073565e0b add: 沧州矿石代码同步加地图版本 2023-12-17 15:29:45 +08:00
limingyu 83c43d21f2 Merge branch 'lmy20231207-登录返回图片和后端地址' into lmy20231215-动火bug修改 2023-12-15 14:11:14 +08:00
zhaoyu e0d63a1bcb 部署31配置文件修改 2023-12-12 10:23:44 +08:00
limingyu cd71673e7c 登录时返回图片和后端接口地址2 2023-12-07 13:50:02 +08:00
limingyu 72cb39f096 曹妃甸动火作业搬到港务局4 2023-12-05 14:13:49 +08:00
limingyu 335d1e04fd 曹妃甸动火作业搬到港务局3 2023-12-05 13:45:52 +08:00
dearlin 3928e7f4d6 add: 分公司系统管理(菜单角色权限) 2023-11-27 09:39:23 +08:00
dearlin 8f1868e6cd 改造配置文件 2023-11-08 10:24:18 +08:00