fys/fys-Multi-tenant
1
0
Fork 0
forked from dyf/fys-Multi-tenant
Code Pull Requests Activity

Compare commits

base: fys:fys-main
Branches Tags
fys:main fys:main-dyf fys:fys-prod fys:fys-main dyf:6170 dyf:dyf-device dyf:main dyf:jingquan dyf:prod dyf:APP权限登录改造
...
compare: fys:17ed75f54a5426069b9cabd5063c971ef658ae8d
Branches Tags
fys:main fys:main-dyf fys:fys-prod fys:fys-main dyf:6170 dyf:dyf-device dyf:main dyf:jingquan dyf:prod dyf:APP权限登录改造

7 Commits
fys-main ... 17ed75f54a

Author SHA1 Message Date
daiyongfei
17ed75f54a Merge branch 'main' into fys-prod 2025-07-23 19:26:46 +08:00
daiyongfei
80b944cbf0 Merge remote-tracking branch 'upstream/main' into fys-prod 
# Conflicts:
#	fys-admin/pom.xml
 2025-07-23 10:57:03 +08:00
daiyongfei
537cc0b2d7 Merge branch 'main' into fys-prod 
# Conflicts:
#	pom.xml
 2025-07-21 08:45:53 +08:00
daiyongfei
6dde6c3a3b 去掉demo 2025-07-21 08:42:21 +08:00
daiyongfei
38724dbfad Merge branch 'main' into fys-prod 2025-07-19 15:58:51 +08:00
daiyongfei
73e1df4232 Merge branch 'main' into fys-prod 2025-07-18 16:30:02 +08:00
daiyongfei
e35955f156 prod 2025-07-17 17:27:14 +08:00
2 changed files with 8 additions and 9 deletions
Expand all files Collapse all files

8
fys-admin/pom.xml
View File

@ -94,10 +94,10 @@
</dependency> </dependency>
<!-- demo模块 --> <!-- demo模块 -->
<!--<dependency> <!-- <dependency> -->
<groupId>com.fuyuanshen</groupId> <!-- <groupId>com.fuyuanshen</groupId> -->
<artifactId>fys-demo</artifactId> <!-- <artifactId>fys-demo</artifactId> -->
</dependency>--> <!-- </dependency> -->
<!-- 工作流模块 --> <!-- 工作流模块 -->
<dependency> <dependency>

9
pom.xml
View File

@ -83,7 +83,10 @@
<monitor.username>fys</monitor.username> <monitor.username>fys</monitor.username>
<monitor.password>123456</monitor.password> <monitor.password>123456</monitor.password>
</properties> </properties>
<!-- <activation> -->
<!-- &lt;!&ndash; 默认环境 &ndash;&gt; -->
<!-- <activeByDefault>true</activeByDefault> -->
<!-- </activation> -->
</profile> </profile>
<profile> <profile>
<id>prod</id> <id>prod</id>
@ -97,10 +100,6 @@
<!-- 默认环境 --> <!-- 默认环境 -->
<activeByDefault>true</activeByDefault> <activeByDefault>true</activeByDefault>
</activation> </activation>
<!-- <activation> -->
<!-- &lt;!&ndash; 默认环境 &ndash;&gt; -->
<!-- <activeByDefault>true</activeByDefault> -->
<!-- </activation> -->
</profile> </profile>
</profiles> </profiles>