Merge remote-tracking branch 'origin/dev' into cjl

cjl

2023-07-13 bfae0be9c3980b6ec09f86bcb543bb8960927e14

 screen-manage/src/main/java/com/moral/api/service/impl/TestServiceImpl.java

@@ -9,10 +9,13 @@
import com.moral.api.mapper.TestMapper;
import com.moral.api.service.TestService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

import javax.annotation.Resource;
import java.util.Map;

/**
 * <p>
@@ -23,10 +26,18 @@
 * @since 2021-02-25
 */
@Service
@ConfigurationProperties(prefix = "code")
public class TestServiceImpl extends ServiceImpl<TestMapper, Test> implements TestService {

    @Resource
    private TestMapper testMapper;

    Map<String,String> map;

    public void setMap(Map<String, String> map) {
        this.map = map;
    }

    @Override
    public Page<Test> selectByPage(Test test, Integer page, Integer size) {
        //设置分页条件
@@ -52,4 +63,9 @@
        }

    }

    @Override
    public Map<String,String> getMap(){
        return map;
    }
}