--no commit message

com.zrqx.bg.sysuser/src/main/java/com/zrqx/bg/sysuser/controller/log/LogController.java

@@ -8,7 +8,6 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
-
 import com.zrqx.bg.sysuser.service.log.LogService;
 import com.zrqx.core.constant.sysuser.SysUserRequestPath;
 import com.zrqx.core.form.sysuser.bg.log.LogForm;

com.zrqx.bg.sysuser/src/main/resources/logback.xml

@@ -5,7 +5,7 @@
     debug="false" scan="true" scanPeriod="30 second">
 	<!--读取配置中心的属性-->
     <springProperty scope="context" name="name" source="spring.application.name"/>
-    <property name="ROOT" value="/opt/logs/mzyy/sysuser/" />
+    <property name="ROOT" value="/opt/logs/jgjy/sysuser/" />
     <property name="FILESIZE" value="10MB" />
     <property name="MAXHISTORY" value="60" />
     <property name="DATETIME" value="yyyy-MM-dd HH:mm:ss" />

com.zrqx.core/src/main/java/com/zrqx/core/model/sysuser/log/Log.java

@@ -6,7 +6,6 @@ import javax.persistence.GeneratedValue;
 import javax.persistence.Id;
 import javax.persistence.Table;
 import javax.persistence.Transient;
-
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -30,4 +29,9 @@ public class Log {
 	@Transient
 	@ApiModelProperty("方法运行结果")
 	private Object result;
+	/** {@link MemberTypeEnum} */
+	@ApiModelProperty("日志类型")
+	private String type;
+	@ApiModelProperty("学校|出版社id")
+	private String relationId;
 }

com.zrqx.fg.sysuser/src/main/java/com/zrqx/fg/sysuser/mapper/log/FgLogMapper.java

@@ -17,10 +17,10 @@ public interface FgLogMapper extends BaseMapper<Log>{
 		    + " and m.createrAccount like concat(#{query.admin},'%') "
 		    + " </if> " 
 		    + " <if test = '" + NOTBLANK + "(query.beginTime)'> "  
-		    + " and m.sendTime <![CDATA[ >= ]]> #{query.beginTime} "
+		    + " and m.createTime <![CDATA[ >= ]]> #{query.beginTime} "
 		    + " </if> " 
 		    + " <if test = '" + NOTBLANK + "(query.endTime)'> "  
-		    + " and m.sendTime <![CDATA[ <= ]]> #{query.endTime} "
+		    + " and m.createTime <![CDATA[ <= ]]> #{query.endTime} "
 		    + " </if> " 
 		    + " </script> ")
 	List<Log> list(@Param("query") queryFgLogForm query);