Commit Graph

24 Commits (c7443b81d70d3a205783f0fe7e16a5b1192851db)

Author SHA1 Message Date
ffr c7443b81d7 车辆管理 2024-04-03 08:38:24 +08:00
ffr f9ec95317c Merge branch 'server_five' of https://gitea.qinmian.online/five-groups/five-groups-couplet into server_five_fufanrui 2024-04-02 10:59:00 +08:00
ffr fa79d7a83b 员工管理 2024-04-01 21:19:21 +08:00
lijiayao 313fd4aa54 Merge remote-tracking branch 'origin/server_five_yuanyonghao' into server_five_xiaoyao
# Conflicts:
#	couplet-auth/src/main/resources/bootstrap.yml
2024-04-01 19:49:39 +08:00
lijiayao 9c9dfb7090 Merge remote-tracking branch 'origin/server_five_liuyunhu' into server_five_xiaoyao
# Conflicts:
#	couplet-auth/src/main/resources/bootstrap.yml
#	couplet-gateway/src/main/resources/bootstrap.yml
#	couplet-modules/couplet-file/src/main/resources/bootstrap.yml
#	couplet-modules/couplet-gen/src/main/resources/bootstrap.yml
#	couplet-modules/couplet-job/src/main/resources/bootstrap.yml
#	couplet-modules/couplet-system/src/main/resources/bootstrap.yml
#	couplet-visual/couplet-monitor/src/main/resources/bootstrap.yml
2024-04-01 19:49:11 +08:00
dongxiaodong a20dc82049 解析报文 2024-03-31 22:28:46 +08:00
liuyunhu f597b6cbfc 虎,车辆模块完善,前台完善,功能已完成 2024-03-31 22:10:30 +08:00
lijiayao 1910013cbb Merge remote-tracking branch 'origin/server_five_fufanrui' into server_five_xiaoyao
# Conflicts:
#	couplet-modules/couplet-enterprisemanagement/couplet-enterprisemanagement-server/src/main/java/com/couplet/server/service/ManageServer.java
#	couplet-modules/couplet-enterprisemanagement/couplet-enterprisemanagement-server/src/main/java/com/couplet/server/service/impl/ManageServiceImpl.java
2024-03-31 10:22:47 +08:00
lijiayao b8e3b4dcd1 feat: 新增、删除 2024-03-31 10:21:50 +08:00
ffr 2b392ec1d1 管理企业 2024-03-31 10:17:59 +08:00
YuanYh 9b683e6129 管理企业更新 2024-03-31 10:12:18 +08:00
ffr 24c219c145 更新代码 2024-03-30 09:50:19 +08:00
lijiayao 089068a745 Merge remote-tracking branch 'origin/server_five_yuanyonghao' into server_five_xiaoyao
# Conflicts:
#	couplet-auth/src/main/resources/bootstrap.yml
#	couplet-gateway/src/main/resources/bootstrap.yml
#	couplet-modules/couplet-file/src/main/resources/bootstrap.yml
#	couplet-modules/couplet-gen/src/main/resources/bootstrap.yml
#	couplet-modules/couplet-job/src/main/resources/bootstrap.yml
#	couplet-modules/couplet-system/src/main/resources/bootstrap.yml
#	couplet-modules/pom.xml
#	couplet-visual/couplet-monitor/src/main/resources/bootstrap.yml
2024-03-30 00:42:05 +08:00
lijiayao 96f9bc50f1 实现业务功能 2024-03-30 00:38:42 +08:00
YuanYh 2f74b536d9 管理企业更新 2024-03-29 21:52:04 +08:00
liuyunhu f46ff2e948 解决配置文件无法覆盖实例问题 2024-03-29 09:11:18 +08:00
lijiayao 5be8c78209 Merge remote-tracking branch 'origin/server_five_yuanyonghao' into server_five_xiaoyao
# Conflicts:
#	couplet-modules/pom.xml
#	pom.xml
2024-03-28 22:38:41 +08:00
lijiayao 5cba075219 feat: 围栏列表 2024-03-28 22:36:22 +08:00
YuanYh c00d4c8904 管理企业 2024-03-28 22:33:31 +08:00
DongZeLiang 847e150cbc 企业管理,伪代码 2024-03-28 17:31:30 +08:00
ffr f9356bd0b7 提交代码 2024-03-28 17:00:41 +08:00
dongxiaodong 3be43f8fb6 基本业务功能 2024-03-27 22:43:38 +08:00
lijiayao 68ced79707 style: 代码初始化 2024-03-26 19:18:33 +08:00
lijiayao 1dce28afa3 style: 代码初始化 2024-03-26 18:45:36 +08:00