Compare commits

..

No commits in common. "7ae902ee1916a011e65a7dd3b1c2a890ef6337d3" and "93a219bc263bedf7cb3b7fd1dd9034490eeb6501" have entirely different histories.

3 changed files with 2 additions and 9 deletions

View File

@ -79,7 +79,6 @@ public class AppUserMoneyController {
userMoneyResult.setMoney(userMoney.getMoney());
userMoneyResult.setCashDeposit(userMoney.getCashDeposit());
userMoneyResult.setId(userMoney.getId());
userMoneyResult.setSad(userMoney.getSad());
//获取当前时间
Date CurrentPeriod = new Date();
//获取当前时间周期的上一个周期

View File

@ -49,7 +49,4 @@ public class UserMoneyResult implements Serializable {
@TableField("user_id")
private Long userId;
@TableField("user_id")
private BigDecimal sad;
}

View File

@ -137,12 +137,9 @@ public class AppArtificerController {
@ApiOperation("查询技师列表")
public Result selectArtificerList(Integer page, Integer limit, Long massageTypeId, String artificerName,
String longitude,String latitude,Integer sort,Integer authentication,
Integer by,String city,Long classifyId,String phone, Integer isStart,Integer technicianType,String isBack,Integer status){
if(status == null){
status = -1;
}
Integer by,String city,Long classifyId,String phone, Integer isStart,Integer technicianType,String isBack){
return artificerService.selectArtificerList(page, limit, massageTypeId, artificerName,longitude,latitude,
sort,authentication,by,status,city,classifyId,phone,1,isStart,technicianType,isBack);
sort,authentication,by,1,city,classifyId,phone,1,isStart,technicianType,isBack);
}