Skip to content

O
order-group
Commit 05a76fb3 by zhiheng.zhang
Options

合并代码解决冲突

parent 1d286401
Showing with 0 additions and 7 deletions
order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java
...@@ -104,10 +104,6 @@ public class OrderAdapter { ...@@ -104,10 +104,6 @@ public class OrderAdapter {
public static final String numberCharWithoutZero = "12345"; public static final String numberCharWithoutZero = "12345";
private static FastDateFormat yyyyMMddHHmmss = FastDateFormat.getInstance("yyyy-MM-dd HH:mm:ss", Locale.CHINA); private static FastDateFormat yyyyMMddHHmmss = FastDateFormat.getInstance("yyyy-MM-dd HH:mm:ss", Locale.CHINA);
public final static String TAKECODEKEY = "takecode";
public static final String REDIS_KEY_SEP = ":";
public static final String numberChar = "0123456789";
public static final String numberCharWithoutZero = "12345";
private static String SPMCHID = "1237482502"; private static String SPMCHID = "1237482502";
// private static String SPWXAPPID = "wx8244c7c48c7d45de"; // private static String SPWXAPPID = "wx8244c7c48c7d45de";
...@@ -145,9 +141,6 @@ public class OrderAdapter { ...@@ -145,9 +141,6 @@ public class OrderAdapter {
private static Gson gson = new Gson(); private static Gson gson = new Gson();
@Autowired @Autowired
private RedisTemplate redisTemplate;
@Autowired
private RedisCache redisCache; private RedisCache redisCache;
/** /**
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment