xufangming/ifsm-base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
xufangming 2025-04-21 15:14:38 +08:00
commit 2e64c0e1ee
3 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.idea/encodings.xml generated
View File

@ -2,6 +2,7 @@
<project version="4"> <project version="4">
<component name="Encoding"> <component name="Encoding">
<file url="file://$PROJECT_DIR$/nxgx-commons/src/main/java" charset="UTF-8" /> <file url="file://$PROJECT_DIR$/nxgx-commons/src/main/java" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/nxgx-commons/src/main/resources" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/nxgx-ifsm-base/src/main/java" charset="UTF-8" /> <file url="file://$PROJECT_DIR$/nxgx-ifsm-base/src/main/java" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/nxgx-ifsm-base/src/main/resources" charset="UTF-8" /> <file url="file://$PROJECT_DIR$/nxgx-ifsm-base/src/main/resources" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/src/main/java" charset="UTF-8" /> <file url="file://$PROJECT_DIR$/src/main/java" charset="UTF-8" />

9
.idea/ifsm-base.iml generated
View File

@ -1,9 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<module type="JAVA_MODULE" version="4">
<component name="NewModuleRootManager" inherit-compiler-output="true">
<exclude-output />
<content url="file://$MODULE_DIR$" />
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
</component>
</module>

2
nxgx-ifsm-base/src/main/java/com/rootcloud/timer/ServicePlanTimer.java
View File

@ -16,7 +16,7 @@ import javax.annotation.Resource;
*/ */
@Component @Component
@Slf4j @Slf4j
//@EnableScheduling @EnableScheduling
public class ServicePlanTimer { public class ServicePlanTimer {
@Resource(name = "servicePlanServiceImpl") @Resource(name = "servicePlanServiceImpl")